Changes to 'refs/tags/osad-5.11.22-1'
by StephenHerr
Tag 'osad-5.11.22-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-03-27 17:42 +0000
Tagging package [osad] version [5.11.22-1] in directory [client/tools/osad/].
Changes since spacewalk-java-1.10.33-1:
Stephen Herr (2):
860937 - somehow I managed to get wrong the version required in rhel 5
Automatic commit of package [osad] release [5.11.22-1].
---
client/tools/osad/osad.spec | 7 +++++--
rel-eng/packages/osad | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
11 years
2 commits - client/tools rel-eng/packages
by StephenHerr
client/tools/osad/osad.spec | 7 +++++--
rel-eng/packages/osad | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit ce18b55ace49451f3e23e9e7a7e35d953246831e
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Mar 27 13:42:25 2013 -0400
Automatic commit of package [osad] release [5.11.22-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 77887a7..d5acf99 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -17,7 +17,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.11.21
+Version: 5.11.22
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -359,6 +359,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Wed Mar 27 2013 Stephen Herr <sherr(a)redhat.com> 5.11.22-1
+- 860937 - somehow I managed to get wrong the version required in rhel 5
+
* Wed Mar 27 2013 Stephen Herr <sherr(a)redhat.com> 5.11.21-1
- 860937 - correct requires on RHEL 5
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index 15eede5..9d0d46a 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.11.21-1 client/tools/osad/
+5.11.22-1 client/tools/osad/
commit b71b5ba033a560c2401c764fdcce7557078379be
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Mar 27 13:42:21 2013 -0400
860937 - somehow I managed to get wrong the version required in rhel 5
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 4650544..77887a7 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -26,7 +26,7 @@ Requires: python
Requires: rhnlib >= 1.8-3
Requires: jabberpy
%if 0%{?rhel} && 0%{?rhel} < 6
-Requires: rhn-client-tools >= 0.4.20-48
+Requires: rhn-client-tools >= 0.4.20-66
%else
%if 0%{?el6}
Requires: rhn-client-tools >= 1.0.0-44
11 years
Changes to 'refs/tags/spacewalk-java-1.10.33-1'
by Tomas Lestach
Tag 'spacewalk-java-1.10.33-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-03-27 17:22 +0000
Tagging package [spacewalk-java] version [1.10.33-1] in directory [java/].
Changes since spacewalk-java-1.10.32-1:
Tomas Lestach (2):
we need at least c3p0 v.0.9.1 to support ConnectionCustomizer
Automatic commit of package [spacewalk-java] release [1.10.33-1].
---
java/spacewalk-java.spec | 11 +++++++----
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
---
11 years
2 commits - java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 11 +++++++----
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit f688b8d4c51ef56af9f6412e25732b20f6d0bbf6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Mar 27 18:22:45 2013 +0100
Automatic commit of package [spacewalk-java] release [1.10.33-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d3e374b..b025779 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.32
+Version: 1.10.33
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -678,6 +678,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Mar 27 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.33-1
+- we need at least c3p0 v.0.9.1 to support ConnectionCustomizer
+
* Wed Mar 27 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.32-1
- introduce RhnConnectionCustomizer
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 29905c9..946d2b9 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.32-1 java/
+1.10.33-1 java/
commit b76c23d88d2cefd9b90516ba41fd3d4de69f1448
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Mar 27 17:06:44 2013 +0100
we need at least c3p0 v.0.9.1 to support ConnectionCustomizer
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3fd6d46..d3e374b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -51,7 +51,7 @@ Requires: jfreechart >= 1.0.9
%endif
Requires: bcel
-Requires: c3p0
+Requires: c3p0 >= 0.9.1
Requires: dwr >= 3
Requires: hibernate3 = 0:3.2.4
Requires: java >= 1:1.6.0
@@ -131,7 +131,7 @@ BuildRequires: checkstyle
# Sadly I need these to symlink the jars properly.
BuildRequires: bcel
-BuildRequires: c3p0
+BuildRequires: c3p0 >= 0.9.1
BuildRequires: concurrent
BuildRequires: cglib
BuildRequires: dom4j
@@ -297,7 +297,7 @@ Requires: jfreechart >= 1.0.9
%endif
Requires: bcel
-Requires: c3p0
+Requires: c3p0 >= 0.9.1
Requires: hibernate3 >= 0:3.2.4
Requires: java >= 0:1.6.0
Requires: java-devel >= 0:1.6.0
11 years
Changes to 'refs/tags/spacewalk-java-1.10.32-1'
by Tomas Lestach
Tag 'spacewalk-java-1.10.32-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-03-27 15:28 +0000
Tagging package [spacewalk-java] version [1.10.32-1] in directory [java/].
Changes since osad-5.11.21-1:
Tomas Lestach (2):
introduce RhnConnectionCustomizer
Automatic commit of package [spacewalk-java] release [1.10.32-1].
---
java/code/src/com/redhat/rhn/common/db/RhnConnectionCustomizer.java | 73 ++++++++++
java/conf/default/rhn_hibernate.conf | 1
java/spacewalk-java.spec | 5
rel-eng/packages/spacewalk-java | 2
4 files changed, 79 insertions(+), 2 deletions(-)
---
11 years
2 commits - java/code java/conf java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/RhnConnectionCustomizer.java | 73 ++++++++++
java/conf/default/rhn_hibernate.conf | 1
java/spacewalk-java.spec | 5
rel-eng/packages/spacewalk-java | 2
4 files changed, 79 insertions(+), 2 deletions(-)
New commits:
commit 237ee31c23e6941c64ce9beefd48ba2b48a31342
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Mar 27 16:28:09 2013 +0100
Automatic commit of package [spacewalk-java] release [1.10.32-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c781215..3fd6d46 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.31
+Version: 1.10.32
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -678,6 +678,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Mar 27 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.32-1
+- introduce RhnConnectionCustomizer
+
* Tue Mar 26 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.31-1
- downloading packages for kickstart via java
- correct capitalization
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index c97580b..29905c9 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.31-1 java/
+1.10.32-1 java/
commit 6e364cdc122ce4c0376199c7ba093b9a3af88a1a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Mar 27 10:32:59 2013 +0100
introduce RhnConnectionCustomizer
addressing:
java.sql.SQLException: Session Time Zone not set!
with oicv10
diff --git a/java/code/src/com/redhat/rhn/common/db/RhnConnectionCustomizer.java b/java/code/src/com/redhat/rhn/common/db/RhnConnectionCustomizer.java
new file mode 100644
index 0000000..82d3575
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/common/db/RhnConnectionCustomizer.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) 2013 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.common.db;
+
+import com.redhat.rhn.common.conf.ConfigDefaults;
+
+import com.mchange.v2.c3p0.ConnectionCustomizer;
+
+import org.apache.log4j.Logger;
+
+import java.lang.reflect.Method;
+import java.sql.Connection;
+import java.util.TimeZone;
+/**
+ * RhnConnectionCustomizer
+ * @version $Rev$
+ */
+public class RhnConnectionCustomizer implements ConnectionCustomizer {
+
+ private static final Logger LOG = Logger.getLogger(RhnConnectionCustomizer.class);
+
+ /**
+ * {@inheritDoc}
+ */
+ public void onAcquire(Connection c, String pdsIdt) throws Exception {
+ if (ConfigDefaults.get().isOracle()) {
+ try {
+ Method setSessionTimeZoneMethod = Class.forName(
+ "oracle.jdbc.driver.OracleConnection").getMethod(
+ "setSessionTimeZone", String.class);
+ if (setSessionTimeZoneMethod != null) {
+ setSessionTimeZoneMethod.invoke(c, TimeZone.getDefault().getID());
+ }
+ }
+ catch (Exception e) {
+ LOG.warn("Failed to set session time zone.");
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void onCheckIn(Connection c, String pdsIdt) throws Exception {
+ // empty
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void onCheckOut(Connection c, String pdsIdt) throws Exception {
+ // empty
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void onDestroy(Connection c, String pdsIdt) throws Exception {
+ // empty
+ }
+}
diff --git a/java/conf/default/rhn_hibernate.conf b/java/conf/default/rhn_hibernate.conf
index fc6ba19..c3f052d 100644
--- a/java/conf/default/rhn_hibernate.conf
+++ b/java/conf/default/rhn_hibernate.conf
@@ -27,6 +27,7 @@ hibernate.c3p0.max_statements=0
# test period value in seconds
hibernate.c3p0.idle_test_period=300
hibernate.c3p0.testConnectionOnCheckout=true
+hibernate.c3p0.connectionCustomizerClassName=com.redhat.rhn.common.db.RhnConnectionCustomizer
hibernate.cache.provider_class=org.hibernate.cache.OSCacheProvider
hibernate.cache.use_query_cache=true
11 years
Changes to 'refs/tags/osad-5.11.21-1'
by StephenHerr
Tag 'osad-5.11.21-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-03-27 15:25 +0000
Tagging package [osad] version [5.11.21-1] in directory [client/tools/osad/].
Changes since spacewalk-schema-1.10.18-1:
Stephen Herr (2):
860937 - correct requires on RHEL 5
Automatic commit of package [osad] release [5.11.21-1].
---
client/tools/osad/osad.spec | 7 +++++--
rel-eng/packages/osad | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
11 years
2 commits - client/tools rel-eng/packages
by StephenHerr
client/tools/osad/osad.spec | 7 +++++--
rel-eng/packages/osad | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 71706e6f350e61c4fe71e2de04d2e1149796469a
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Mar 27 11:25:20 2013 -0400
Automatic commit of package [osad] release [5.11.21-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 97216b3..4650544 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -17,7 +17,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.11.20
+Version: 5.11.21
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -359,6 +359,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Wed Mar 27 2013 Stephen Herr <sherr(a)redhat.com> 5.11.21-1
+- 860937 - correct requires on RHEL 5
+
* Tue Mar 26 2013 Stephen Herr <sherr(a)redhat.com> 5.11.20-1
- 860937 - update osad requires versions for rhel 5 and 6
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index 60f7d5c..15eede5 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.11.20-1 client/tools/osad/
+5.11.21-1 client/tools/osad/
commit bd01bd8f9f05bcb36034ad6caa2fd4cc85e40670
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Mar 27 11:15:42 2013 -0400
860937 - correct requires on RHEL 5
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index af36822..97216b3 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -25,7 +25,7 @@ BuildRequires: python-devel
Requires: python
Requires: rhnlib >= 1.8-3
Requires: jabberpy
-%if 0%{?el5}
+%if 0%{?rhel} && 0%{?rhel} < 6
Requires: rhn-client-tools >= 0.4.20-48
%else
%if 0%{?el6}
11 years
Changes to 'refs/tags/spacewalk-schema-1.10.18-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.10.18-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-03-27 12:51 +0000
Tagging package [spacewalk-schema] version [1.10.18-1] in directory [schema/spacewalk/].
Changes since spacewalk-backend-1.10.15-1:
Jan Pazdziora (2):
Specify default for nrsocket during upgrade as well.
Automatic commit of package [spacewalk-schema] release [1.10.18-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql | 1 +
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.oracle | 2 --
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql.postgresql | 3 ---
5 files changed, 6 insertions(+), 7 deletions(-)
---
11 years
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit fae53632f517ef5a8dc41d615e501686018bb894
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Mar 27 13:51:57 2013 +0100
Automatic commit of package [spacewalk-schema] release [1.10.18-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 1c4a1c2..649314c 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.10.17-1 schema/spacewalk/
+1.10.18-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index b28c2cc..b401f44 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.10.17
+Version: 1.10.18
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed Mar 27 2013 Jan Pazdziora 1.10.18-1
+- Specify default for nrsocket during upgrade as well.
+
* Wed Mar 27 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.17-1
- 918333 - don't strip long path
11 years