spacewalk-commits April 2013

spacewalk-commits@lists.fedorahosted.org

12 participants
275 discussions

java/code
by Tomas Lestach 23 Apr '13

23 Apr '13

java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/struts/RhnListAction.java | 8 +++++++- java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) New commits: commit b34c3c7634d7601e95dadfe9c85b3bd3d4fb0e4c Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 23 13:52:38 2013 +0200 928416 - display information message when filtering using older list tags with a link to clear the filter diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 7489b56..eca57bb 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -7180,6 +7180,9 @@ Follow this url to see the full list of inactive systems: <trans-unit id="satisfactionUnknown"> <source>Unknown</source> </trans-unit> + <trans-unit id="filter.clearfilter"> + <source>The list below is filtered.<br/> <a href="{0}"> <strong>Clear filter to see all items.</strong> </a></source> + </trans-unit> <trans-unit id="listtag.clearfilter"> <source>Clear filter </source> </trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnListAction.java b/java/code/src/com/redhat/rhn/frontend/struts/RhnListAction.java index 6a6abbe..ea80219 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnListAction.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnListAction.java @@ -22,6 +22,8 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.common.BadParameterException; import com.redhat.rhn.frontend.listview.PageControl; +import org.apache.commons.lang.StringUtils; + import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -66,7 +68,11 @@ public class RhnListAction extends RhnAction { pc.setStart(lower); pc.setPageSize(viewer.getPageSize()); - pc.setFilterData(request.getParameter(RequestContext.FILTER_STRING)); + String filterString = request.getParameter(RequestContext.FILTER_STRING); + if (!StringUtils.isBlank(filterString)) { + createSuccessMessage(request, "filter.clearfilter", request.getRequestURI()); + } + pc.setFilterData(filterString); } protected List trackSet(RhnSet set, HttpServletRequest request) { diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java b/java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java index ccf1203..21ddcd0 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnUnpagedListAction.java @@ -21,6 +21,7 @@ import com.redhat.rhn.frontend.listview.ListControl; import org.apache.commons.lang.StringUtils; import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; /** * RhnUnpagedListAction @@ -47,6 +48,10 @@ public class RhnUnpagedListAction extends RhnAction { String filterData = request.getParameter(RequestContext.FILTER_STRING); request.setAttribute("isFiltered", Boolean.valueOf(!StringUtils.isEmpty(filterData))); + if (!StringUtils.isBlank(filterData)) { + HttpServletRequest req = (HttpServletRequest) request; + createSuccessMessage(req, "filter.clearfilter", req.getRequestURI()); + } lc.setFilterData(filterData); }

1 0

java/code
by Tomas Lestach 23 Apr '13

23 Apr '13

java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit b18c0624534640b1296d2f7cd7233fb0d30beb6a Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 23 09:42:16 2013 +0200 update proxy.listAvailableProxyChannels API as we cannot transfer null via xmlrpc diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java index 0d05df7..6ca829d 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/proxy/ProxyHandler.java @@ -28,6 +28,7 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.xmlrpc.BaseHandler; import com.redhat.rhn.frontend.xmlrpc.InvalidProxyVersionException; import com.redhat.rhn.frontend.xmlrpc.MethodInvalidParamException; +import com.redhat.rhn.frontend.xmlrpc.NoSuchSystemException; import com.redhat.rhn.frontend.xmlrpc.ProxyAlreadyRegisteredException; import com.redhat.rhn.frontend.xmlrpc.ProxyNeedProvisioningException; import com.redhat.rhn.frontend.xmlrpc.ProxyNotActivatedException; @@ -289,8 +290,9 @@ public class ProxyHandler extends BaseHandler { catch (SAXException e) { log.error("Problem parsing certificate", e); } + if (server == null) { - return null; + throw new NoSuchSystemException(); } ChannelFamily proxyFamily = ChannelFamilyFactory @@ -298,13 +300,14 @@ public class ProxyHandler extends BaseHandler { .PROXY_CHANNEL_FAMILY_LABEL, null); + List<String> returnList = new ArrayList<String>(); + if (proxyFamily == null || proxyFamily.getChannels() == null || proxyFamily.getChannels().isEmpty()) { - return null; + return returnList; } - List<String> returnList = new ArrayList<String>(); /* We search for a proxy channel whose parent channel is our server's basechannel. * This will be the channel we attempt to subscribe the server to. */

1 0

Changes to 'refs/tags/spacewalk-setup-1.10.7-1'
by Jan Pazdziora 23 Apr '13

23 Apr '13

Tag 'spacewalk-setup-1.10.7-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-04-23 07:38 +0000 Tagging package [spacewalk-setup] version [1.10.7-1] in directory [spacewalk/setup/]. Changes since perl-Net-INET6Glue-0.5-3: Jan Pazdziora (3): Adding perl-Net-INET6Glue to comps. Make HEAD work even against AAAA hostname. Automatic commit of package [spacewalk-setup] release [1.10.7-1]. Shannon Hughes (1): 955364 - remove caching for activation keys --- java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java | 1 - rel-eng/comps/comps-spacewalk-server-fedora17.xml | 1 + rel-eng/comps/comps-spacewalk-server-fedora18.xml | 1 + rel-eng/comps/comps-spacewalk-server-rhel5.xml | 1 + rel-eng/comps/comps-spacewalk-server-rhel6.xml | 1 + rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/bin/spacewalk-setup | 2 +- spacewalk/setup/spacewalk-setup.spec | 6 +++++- 8 files changed, 11 insertions(+), 4 deletions(-) ---

1 0

rel-eng/packages spacewalk/setup
by Jan Pazdziora 23 Apr '13

23 Apr '13

rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/spacewalk-setup.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 99f3dd04214f86abffdd72550bfc5e9fcbd33d95 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 23 09:38:18 2013 +0200 Automatic commit of package [spacewalk-setup] release [1.10.7-1]. diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index bd1724f..b536f08 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -1.10.6-1 spacewalk/setup/ +1.10.7-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index 2fa8524..b6e0998 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,7 +1,7 @@ %{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}} Name: spacewalk-setup -Version: 1.10.6 +Version: 1.10.7 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk @@ -102,6 +102,9 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Tue Apr 23 2013 Jan Pazdziora 1.10.7-1 +- Make HEAD work even against AAAA hostname. + * Tue Apr 16 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.6-1 - restore should not shutdown services automatically

1 0

spacewalk/setup
by Jan Pazdziora 23 Apr '13

23 Apr '13

spacewalk/setup/bin/spacewalk-setup | 2 +- spacewalk/setup/spacewalk-setup.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit e8e5129f0996e67c0bc0e2bb78803e196b6b4c61 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Apr 22 17:54:34 2013 +0200 Make HEAD work even against AAAA hostname. diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index c1d9eec..cef6055 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -1416,7 +1416,7 @@ sub wait_for_tomcat { } for (my $i = 0; $i < 20; $i++) { - my $retval = system("PERL_LWP_SSL_VERIFY_HOSTNAME=0 HEAD http://$hostname/ > /dev/null 2>&1"); + my $retval = system("PERL_LWP_SSL_VERIFY_HOSTNAME=0 PERL5OPT=-MNet::INET6Glue::INET_is_INET6 HEAD http://$hostname/ > /dev/null 2>&1"); if ($retval) { sleep 5; } diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index 9855c4a..2fa8524 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -31,6 +31,7 @@ Requires: PyYAML Requires: /usr/bin/gpg Requires: spacewalk-setup-jabberd Requires: perl(LWP::Protocol::https) +Requires: perl(Net::INET6Glue::INET_is_INET6) %description A collection of post-installation scripts for managing Spacewalk's initial

1 0

java/code
by Tomas Lestach 23 Apr '13

23 Apr '13

java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java | 1 - 1 file changed, 1 deletion(-) New commits: commit 3314d6bc5acb796774cdbd3c614cb62b36b3007f Author: Shannon Hughes <shughes(a)redhat.com> Date: Mon Apr 22 17:02:37 2013 -0400 955364 - remove caching for activation keys diff --git a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java index 68ccea9..b609620 100644 --- a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java +++ b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java @@ -331,7 +331,6 @@ public class ActivationKeyManager { session = HibernateFactory.getSession(); return session.getNamedQuery("ActivationKey.findByOrg") .setEntity("org", requester.getOrg()) - .setCacheable(true) .list(); }

1 0

Changes to 'refs/tags/perl-Net-INET6Glue-0.5-3'
by Jan Pazdziora 22 Apr '13

22 Apr '13

Tag 'perl-Net-INET6Glue-0.5-3' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-04-22 13:26 +0000 Tagging package [perl-Net-INET6Glue] version [0.5-3] in directory [spec-tree/perl-Net-INET6Glue/]. Changes since spacewalk-java-1.10.64-1: Jan Pazdziora (2): Fixing build.py.props for the new package. Automatic commit of package [perl-Net-INET6Glue] minor release [0.5-3]. --- rel-eng/packages/perl-Net-INET6Glue | 2 +- spec-tree/perl-Net-INET6Glue/build.py.props | 3 +++ spec-tree/perl-Net-INET6Glue/perl-Net-INET6Glue.spec | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) ---

1 0

3 commits - rel-eng/comps rel-eng/packages spec-tree/perl-Net-INET6Glue
by Jan Pazdziora 22 Apr '13

22 Apr '13

rel-eng/comps/comps-spacewalk-server-fedora17.xml | 1 + rel-eng/comps/comps-spacewalk-server-fedora18.xml | 1 + rel-eng/comps/comps-spacewalk-server-rhel5.xml | 1 + rel-eng/comps/comps-spacewalk-server-rhel6.xml | 1 + rel-eng/packages/perl-Net-INET6Glue | 2 +- spec-tree/perl-Net-INET6Glue/build.py.props | 3 +++ spec-tree/perl-Net-INET6Glue/perl-Net-INET6Glue.spec | 5 ++++- 7 files changed, 12 insertions(+), 2 deletions(-) New commits: commit 0054ded629c00012f24c7241cf2c9eace43ff350 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Apr 22 15:24:52 2013 +0200 Adding perl-Net-INET6Glue to comps. diff --git a/rel-eng/comps/comps-spacewalk-server-fedora17.xml b/rel-eng/comps/comps-spacewalk-server-fedora17.xml index 2e52bfe..fb6ba1a 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora17.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora17.xml @@ -44,6 +44,7 @@ <packagereq type="default">osa-dispatcher</packagereq> <packagereq type="default">osa-dispatcher-selinux</packagereq> <packagereq type="default">perl-DBD-Oracle</packagereq> + <packagereq type="default">perl-Net-INET6Glue</packagereq> <packagereq type="default">perl-NOCpulse-CLAC</packagereq> <packagereq type="default">perl-NOCpulse-Debug</packagereq> <packagereq type="default">perl-NOCpulse-Gritch</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-fedora18.xml b/rel-eng/comps/comps-spacewalk-server-fedora18.xml index 2e52bfe..fb6ba1a 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora18.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora18.xml @@ -44,6 +44,7 @@ <packagereq type="default">osa-dispatcher</packagereq> <packagereq type="default">osa-dispatcher-selinux</packagereq> <packagereq type="default">perl-DBD-Oracle</packagereq> + <packagereq type="default">perl-Net-INET6Glue</packagereq> <packagereq type="default">perl-NOCpulse-CLAC</packagereq> <packagereq type="default">perl-NOCpulse-Debug</packagereq> <packagereq type="default">perl-NOCpulse-Gritch</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml index 2ec06a0..2642024 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml @@ -82,6 +82,7 @@ <packagereq type="default">perl-DBD-Oracle</packagereq> <packagereq type="default">perl-Error</packagereq> <packagereq type="default">perl-FreezeThaw</packagereq> + <packagereq type="default">perl-Net-INET6Glue</packagereq> <packagereq type="default">perl-Mail-RFC822-Address</packagereq> <packagereq type="default">perl-NOCpulse-CLAC</packagereq> <packagereq type="default">perl-NOCpulse-Debug</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml index b1405c6..82cae8f 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml @@ -45,6 +45,7 @@ <packagereq type="default">osa-dispatcher-selinux</packagereq> <packagereq type="default">perl-DBD-Oracle</packagereq> <packagereq type="default">perl-Mail-RFC822-Address</packagereq> + <packagereq type="default">perl-Net-INET6Glue</packagereq> <packagereq type="default">perl-NOCpulse-CLAC</packagereq> <packagereq type="default">perl-NOCpulse-Debug</packagereq> <packagereq type="default">perl-NOCpulse-Gritch</packagereq> commit b7e6ab00de41c27ba95f994f9c0d5d128cd37ba8 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Apr 22 15:26:13 2013 +0200 Automatic commit of package [perl-Net-INET6Glue] minor release [0.5-3]. diff --git a/rel-eng/packages/perl-Net-INET6Glue b/rel-eng/packages/perl-Net-INET6Glue index 8d70d80..f276448 100644 --- a/rel-eng/packages/perl-Net-INET6Glue +++ b/rel-eng/packages/perl-Net-INET6Glue @@ -1 +1 @@ -0.5-2 spec-tree/perl-Net-INET6Glue/ +0.5-3 spec-tree/perl-Net-INET6Glue/ diff --git a/spec-tree/perl-Net-INET6Glue/perl-Net-INET6Glue.spec b/spec-tree/perl-Net-INET6Glue/perl-Net-INET6Glue.spec index 96eba19..19fd065 100644 --- a/spec-tree/perl-Net-INET6Glue/perl-Net-INET6Glue.spec +++ b/spec-tree/perl-Net-INET6Glue/perl-Net-INET6Glue.spec @@ -1,6 +1,6 @@ Name: perl-Net-INET6Glue Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Make common modules IPv6 ready by hotpatching License: GPL+ or Artistic Group: Development/Libraries @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Mon Apr 22 2013 Jan Pazdziora 0.5-3 +- Fixing build.py.props for the new package. + * Fri Apr 19 2013 Jan Pazdziora 0.5-2 - Relax the IO::Socket::INET6 version requirement on RHEL 5. commit 29990f65d4cca4d93de6b3437a0868961caeed6c Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Apr 22 15:23:55 2013 +0200 Fixing build.py.props for the new package. diff --git a/spec-tree/perl-Net-INET6Glue/build.py.props b/spec-tree/perl-Net-INET6Glue/build.py.props new file mode 100644 index 0000000..ebbe79a --- /dev/null +++ b/spec-tree/perl-Net-INET6Glue/build.py.props @@ -0,0 +1,3 @@ +[buildconfig] +tagger = spacewalk.releng.tagger.ReleaseTagger +builder = spacewalkx.builderx.NoTgzBuilder

1 0

Changes to 'refs/tags/spacewalk-java-1.10.64-1'
by Tomas Lestach 22 Apr '13

22 Apr '13

Tag 'spacewalk-java-1.10.64-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-04-22 13:21 +0000 Tagging package [spacewalk-java] version [1.10.64-1] in directory [java/]. Changes since perl-Net-INET6Glue-0.5-2: Tomas Lestach (4): let's make CachedStatement serializable fix typo: RESRTICTED -> RESTRICTED manually deregister drivers to prevent tomcat informing about possible memory leaks Automatic commit of package [spacewalk-java] release [1.10.64-1]. --- java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java | 7 +++ java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java | 6 +-- java/code/src/com/redhat/rhn/webapp/RhnServletListener.java | 20 ++++++++++ java/spacewalk-java.spec | 8 +++- rel-eng/packages/spacewalk-java | 2 - 5 files changed, 37 insertions(+), 6 deletions(-) ---

1 0

4 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 22 Apr '13

22 Apr '13

java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java | 7 +++ java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java | 6 +-- java/code/src/com/redhat/rhn/webapp/RhnServletListener.java | 20 ++++++++++ java/spacewalk-java.spec | 8 +++- rel-eng/packages/spacewalk-java | 2 - 5 files changed, 37 insertions(+), 6 deletions(-) New commits: commit e71f340ca97355f759289a16a94944c0473ef140 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Apr 22 15:21:37 2013 +0200 Automatic commit of package [spacewalk-java] release [1.10.64-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index e75fb94..89d302b 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.10.63 +Version: 1.10.64 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -751,6 +751,12 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Mon Apr 22 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.64-1 +- manually deregister drivers to prevent tomcat informing about possible memory + leaks +- fix typo: RESRTICTED -> RESTRICTED +- let's make CachedStatement serializable + * Fri Apr 19 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.63-1 - remove unused method+query - offer a null org channels for SSM servers with no base diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index d465f63..d16ac81 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.10.63-1 java/ +1.10.64-1 java/ commit 92ee71c49765db86a82e69593a519d39e64c2aa9 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Apr 22 14:24:10 2013 +0200 manually deregister drivers to prevent tomcat informing about possible memory leaks addressing: SEVERE: A web application registered the JBDC driver [org.postgresql.Driver] but failed to unregister it when the web application was stopped. To prevent a memory leak, the JDBC Driver has been forcibly unregistered. diff --git a/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java b/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java index 0924c91..f9712d6 100644 --- a/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java +++ b/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java @@ -21,6 +21,11 @@ import com.redhat.rhn.manager.satellite.UpgradeCommand; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; +import java.sql.Driver; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.Enumeration; + import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; @@ -131,6 +136,21 @@ public class RhnServletListener implements ServletContextListener { stopHibernate(); logStop("Hibernate"); + // This manually deregisters JDBC driver, + // which prevents Tomcat from complaining about memory leaks + Enumeration<Driver> drivers = DriverManager.getDrivers(); + while (drivers.hasMoreElements()) { + Driver driver = drivers.nextElement(); + try { + DriverManager.deregisterDriver(driver); + log.info("deregistering jdbc driver: " + driver); + } + catch (SQLException e) { + log.warn("Error deregistering driver " + driver); + } + } + + // shutdown the logger to avoid ThreadDeath exception during // webapp reload. LogManager.shutdown(); commit b44ef2cbc0520e0d3c1562a1ef36a0d5dc81e3a4 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Apr 22 14:22:47 2013 +0200 fix typo: RESRTICTED -> RESTRICTED diff --git a/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java b/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java index 8d98896..ab21725 100644 --- a/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java +++ b/java/code/src/com/redhat/rhn/frontend/security/PxtAuthenticationService.java @@ -42,7 +42,7 @@ public class PxtAuthenticationService extends BaseAuthenticationService { private static final Set UNPROTECTED_URIS; private static final Set POST_UNPROTECTED_URIS; private static final Set LOGIN_URIS; - private static final Set RESRTICTED_WHITELIST_URIS; + private static final Set RESTRICTED_WHITELIST_URIS; static { TreeSet set = new TreeSet(); @@ -122,7 +122,7 @@ public class PxtAuthenticationService extends BaseAuthenticationService { // system search set.add("/rhn/systems/Search.do"); - RESRTICTED_WHITELIST_URIS = UnmodifiableSet.decorate(set); + RESTRICTED_WHITELIST_URIS = UnmodifiableSet.decorate(set); } private PxtSessionDelegate pxtDelegate; @@ -143,7 +143,7 @@ public class PxtAuthenticationService extends BaseAuthenticationService { } protected Set getRestrictedWhitelistURIs() { - return RESRTICTED_WHITELIST_URIS; + return RESTRICTED_WHITELIST_URIS; } /** commit c3bdbe6ebfc88838cbfa7db124e17d14cc5480e2 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Apr 22 12:04:00 2013 +0200 let's make CachedStatement serializable addressing: SEVERE: IOException while loading persisted sessions: java.io.WriteAbortedException: writing aborted; java.io.NotSerializableException: com.redhat.rhn.common.db.datasource.Cac hedStatement Throwable occurred: java.io.WriteAbortedException: writing aborted; java.io.NotSerializableException: com.redhat.rhn.common.db.datasource.CachedStatement at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1339) at java.io.ObjectInputStream.readObject(ObjectInputStream.java:354) ... at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:289) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:414) diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java index ad52388..676603d 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java +++ b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java @@ -28,6 +28,7 @@ import org.apache.log4j.Logger; import org.hibernate.HibernateException; import org.hibernate.Session; +import java.io.Serializable; import java.lang.reflect.Method; import java.math.BigDecimal; import java.sql.CallableStatement; @@ -51,9 +52,13 @@ import java.util.StringTokenizer; * * @version $Rev$ */ -public class CachedStatement { +public class CachedStatement implements Serializable { /** + * Comment for <code>serialVersionUID</code> + */ + private static final long serialVersionUID = -6256397039512492615L; + /** * Logger for this class */ private static Logger log = Logger

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits April 2013