Changes to 'refs/tags/spacewalk-setup-1.2.2-1'
by Justin Sherrill
Tag 'spacewalk-setup-1.2.2-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-08-26 16:47 +0000
Tagging package [spacewalk-setup] version [1.2.2-1] in directory [spacewalk/setup/].
Changes since spacewalk-setup-1.2.1-1:
Colin Coe (1):
484895 - Stop the release link giving a 404
Justin Sherrill (2):
533527 - having spacewalk-setup patch the web.xml for tomcat to turn off development mode
Automatic commit of package [spacewalk-setup] release [1.2.2-1].
---
java/code/webapp/WEB-INF/includes/footer.jsp | 2 +-
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/bin/spacewalk-setup | 9 ++++++++-
spacewalk/setup/share/web.xml.patch | 13 +++++++++++++
spacewalk/setup/spacewalk-setup.spec | 7 ++++++-
5 files changed, 29 insertions(+), 4 deletions(-)
---
13 years, 8 months
3 commits - rel-eng/packages spacewalk/setup
by Justin Sherrill
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/bin/spacewalk-setup | 9 ++++++++-
spacewalk/setup/share/web.xml.patch | 12 ++++++++++++
spacewalk/setup/spacewalk-setup.spec | 7 ++++++-
4 files changed, 27 insertions(+), 3 deletions(-)
New commits:
commit 8d885ebaf737e08da4e6aa033bd81b98dcd5cf82
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Aug 26 12:59:36 2010 -0400
making patch command silent
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 7ccf088..2d7336c 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -541,7 +541,7 @@ sub setup_tomcat {
}
$web_patch = Spacewalk::Setup::SHARED_DIR."/web.xml.patch";
- $command = "patch --directory=$tomcatdir --forward -p1 --input=$web_patch";
+ $command = "patch --silent --directory=$tomcatdir --forward -p1 --input=$web_patch";
system($command." --dry-run");
if (not $?){
Spacewalk::Setup::backup_file($tomcatdir, $webxml);
commit dc476cc0696e7c2a60b7556631f9f7f4d4d0e2ad
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Aug 26 12:47:20 2010 -0400
Automatic commit of package [spacewalk-setup] release [1.2.2-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 588f7a4..3c48f7a 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.2.1-1 spacewalk/setup/
+1.2.2-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index fdfa89f..fdc5166 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.2.1
+Version: 1.2.2
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -103,6 +103,10 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Thu Aug 26 2010 Justin Sherrill <jsherril(a)redhat.com> 1.2.2-1
+- 533527 - having spacewalk-setup patch the web.xml for tomcat to turn off
+ development mode (jsherril(a)redhat.com)
+
* Thu Aug 26 2010 Jan Pazdziora 1.2.1-1
- As we never fork now, the --nofork is obsolete, removing.
commit ffe25de359af60ef8e9305ff761932fbc3f4408b
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Aug 26 12:43:38 2010 -0400
533527 - having spacewalk-setup patch the web.xml for tomcat to turn off development mode
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 3339b5a..7ccf088 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -482,7 +482,7 @@ sub setup_tomcat {
my $tomcatdir = "/etc/$tomcatX";
my $tomcatconf = "$tomcatX.conf";
my $serverxml = "server.xml";
-
+ my $webxml = "web.xml";
die "$tomcatdir/$tomcatconf does not exist.\n" unless (-f "$tomcatdir/$tomcatconf");
{
@@ -540,6 +540,13 @@ sub setup_tomcat {
}
}
+ $web_patch = Spacewalk::Setup::SHARED_DIR."/web.xml.patch";
+ $command = "patch --directory=$tomcatdir --forward -p1 --input=$web_patch";
+ system($command." --dry-run");
+ if (not $?){
+ Spacewalk::Setup::backup_file($tomcatdir, $webxml);
+ system($command);
+ }
return;
}
diff --git a/spacewalk/setup/share/web.xml.patch b/spacewalk/setup/share/web.xml.patch
new file mode 100644
index 0000000..da0dc25
--- /dev/null
+++ b/spacewalk/setup/share/web.xml.patch
@@ -0,0 +1,12 @@
+--- a/web.xml
++++ b/web.xml
+@@ -220,6 +220,10 @@
+ <param-name>xpoweredBy</param-name>
+ <param-value>false</param-value>
+ </init-param>
++ <init-param>
++ <param-name>development</param-name>
++ <param-value>false</param-value>
++ </init-param>
+ <load-on-startup>3</load-on-startup>
+ </servlet>
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 3dbe2bf..fdfa89f 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -65,6 +65,7 @@ install -m 0644 share/ssl.conf.6 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/tomcatX.conf.1 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/tomcatX.conf.2 %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/server.xml.xsl %{buildroot}/%{_datadir}/spacewalk/setup/
+install -m 0644 share/web.xml.patch %{buildroot}/%{_datadir}/spacewalk/setup/
install -m 0644 share/old-jvm-list %{buildroot}/%{_datadir}/spacewalk/setup/
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/defaults.d/
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/upgrade
13 years, 8 months
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java | 3 ---
java/code/src/com/redhat/rhn/taskomatic/TaskoJob.java | 5 +++--
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 828793c2136fbda7e8d7d168bec22d3593bb8ef6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 26 17:24:45 2010 +0200
fix user email notification
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoJob.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoJob.java
index acd4278..1915156 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoJob.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoJob.java
@@ -174,8 +174,9 @@ public class TaskoJob implements Job {
log.debug(task.getName() + " (" + schedule.getJobLabel() + ") ... " +
taskRun.getStatus().toLowerCase());
- if ((taskRun.getStatus() != TaskoRun.STATUS_SKIPPED) &&
- (taskRun.getStatus() != lastStatus.get(task.getName()))) {
+ if (((taskRun.getStatus() == TaskoRun.STATUS_FINISHED) ||
+ (taskRun.getStatus() == TaskoRun.STATUS_FAILED)) &&
+ (taskRun.getStatus() != lastStatus.get(task.getName()))) {
String email = "Taskomatic bunch " + schedule.getBunch().getName() +
" was scheduled to run within the " + schedule.getJobLabel() +
" schedule.\n\n" + "Subtask " + task.getName();
commit 1bbf7aeb0ca67ec092dbce5c912382caf8873228
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Aug 26 17:23:30 2010 +0200
fix ChannelSoftwareHandlerTest.testMergeErrataByDate test
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java
index a0c8a34..a94fa53 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java
@@ -926,9 +926,6 @@ public class ChannelSoftwareHandlerTest extends BaseHandlerTestCase {
mergeResult = handler.mergeErrata(adminKey, mergeFrom.getLabel(),
mergeTo.getLabel(), "2006-09-30", "2007-10-30");
assertEquals(mergeResult.length, 0);
-
- toList = handler.listErrata(adminKey, mergeTo.getLabel());
- assertEquals(toList.size(), fromList.size());
}
13 years, 8 months
java/code
by Colin Coe
java/code/webapp/WEB-INF/includes/footer.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6be31d465cd22e3d17a1e968e19544dfdc4d9b0d
Author: Colin Coe <colin.coe(a)gmail.com>
Date: Thu Aug 26 21:18:38 2010 +0800
484895 - Stop the release link giving a 404
diff --git a/java/code/webapp/WEB-INF/includes/footer.jsp b/java/code/webapp/WEB-INF/includes/footer.jsp
index 823fe97..c4f8db9 100644
--- a/java/code/webapp/WEB-INF/includes/footer.jsp
+++ b/java/code/webapp/WEB-INF/includes/footer.jsp
@@ -7,7 +7,7 @@
<a href="https://www.redhat.com/legal/privacy_statement.html"><bean:message key="footer.jsp.privacyStatement"/></a>
: <a href="http://www.redhat.com/legal/legal_statement.html"><bean:message key="footer.jsp.legalStatement"/></a>
: <a href="http://www.redhat.com/">redhat.com</a>
- <div style="color: black"><bean:message key="footer.jsp.release" arg0="/rhn/help/release-notes/satellite/index.jsp" arg1="${rhn:getConfig('web.version')}" /></div>
+ <div style="color: black"><bean:message key="footer.jsp.release" arg0="/rhn/help/dispatcher/release_notes" arg1="${rhn:getConfig('web.version')}" /></div>
<p><%@ include file="/WEB-INF/pages/common/fragments/bugzilla.jspf" %></p>
13 years, 8 months
Changes to 'refs/tags/spacewalk-setup-1.2.1-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.2.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-08-26 13:12 +0000
Tagging package [spacewalk-setup] version [1.2.1-1] in directory [spacewalk/setup/].
Changes since spacewalk-admin-1.2.2-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-setup] release [1.2.1-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 8 months
rel-eng/packages spacewalk/setup
by Jan Pazdziora
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 3204bd15b51aad17e69aa98fdbb02db8209188f8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Aug 26 15:12:18 2010 +0200
Automatic commit of package [spacewalk-setup] release [1.2.1-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 42c195a..588f7a4 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.1.14-1 spacewalk/setup/
+1.2.1-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 8db8b27..3dbe2bf 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.2.0
+Version: 1.2.1
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Thu Aug 26 2010 Jan Pazdziora 1.2.1-1
+- As we never fork now, the --nofork is obsolete, removing.
+
* Thu Jul 29 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.14-1
- 531719 - making pxe_just_once set to 1 by default on a spacewalk install
(jsherril(a)redhat.com)
13 years, 8 months
Changes to 'refs/tags/spacewalk-admin-1.2.2-1'
by Jan Pazdziora
Tag 'spacewalk-admin-1.2.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-08-26 13:11 +0000
Tagging package [spacewalk-admin] version [1.2.2-1] in directory [spacewalk/admin/].
Changes since spacewalk-schema-1.2.7-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-admin] release [1.2.2-1].
---
rel-eng/packages/spacewalk-admin | 2 +-
spacewalk/admin/spacewalk-admin.spec | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
---
13 years, 8 months
rel-eng/packages spacewalk/admin
by Jan Pazdziora
rel-eng/packages/spacewalk-admin | 2 +-
spacewalk/admin/spacewalk-admin.spec | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit d2383a60d89dd67a337583d45014c5c3af21219a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Aug 26 15:11:49 2010 +0200
Automatic commit of package [spacewalk-admin] release [1.2.2-1].
diff --git a/rel-eng/packages/spacewalk-admin b/rel-eng/packages/spacewalk-admin
index f7a10c0..79093a9 100644
--- a/rel-eng/packages/spacewalk-admin
+++ b/rel-eng/packages/spacewalk-admin
@@ -1 +1 @@
-1.2.1-1 spacewalk/admin/
+1.2.2-1 spacewalk/admin/
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index 5068dec..62eaa9c 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -2,7 +2,7 @@
Summary: Various utility scripts and data files for RHN Satellite installations
Name: spacewalk-admin
URL: https://fedorahosted.org/spacewalk
-Version: 1.2.1
+Version: 1.2.2
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
License: GPLv2
@@ -60,6 +60,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/validate-sat-cert.3.gz
%changelog
+* Thu Aug 26 2010 Jan Pazdziora 1.2.2-1
+- 626420 - chdir to root to stop sqlplus from searching the mounted devices.
+- As we never fork now, the --nofork is obsolete, removing.
+- We do not call the schema population from WebUI, no forking.
+- The dbhome is not needed as we are using the InstantClient sqlplus.
+
* Tue Aug 24 2010 Milan Zazrivec <mzazrivec(a)redhat.com> 1.2.1-1
- make schema overrides work with new main.sql structure
13 years, 8 months
Changes to 'refs/tags/spacewalk-schema-1.2.7-1'
by Michael Mraka
Tag 'spacewalk-schema-1.2.7-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-08-26 13:10 +0000
Tagging package [spacewalk-schema] version [1.2.7-1] in directory [schema/spacewalk/].
Changes since oracle-selinux-0.1-23.18:
Colin Coe (1):
621479 - Fix missing duplicates menu
Jan Pazdziora (4):
The dbhome is not needed as we are using the InstantClient sqlplus.
We do not call the schema population from WebUI, no forking.
As we never fork now, the --nofork is obsolete, removing.
626420 - chdir to root to stop sqlplus from searching the mounted devices.
Michael Mraka (2):
593896 - schema upgrade script rewritten to pl/sql
Automatic commit of package [spacewalk-schema] release [1.2.7-1].
Tomas Lestach (1):
fixed definition of rhnChannelNewestPackageView
---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/views/rhnChannelNewestPackageView.sql | 14 -
schema/spacewalk/spacewalk-schema.spec | 10
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/041-update_kickstart_partitions.py | 133 ----------
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/041-update_kickstart_partitions.sql | 69 +++++
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/051-rhnChannelNewestPackageView.sql | 10
spacewalk/admin/rhn-populate-database.pl | 25 -
spacewalk/setup/lib/Spacewalk/Setup.pm | 2
web/html/nav/duplicate_systems_tabs.xml | 14 +
web/html/nav/sitenav-authenticated.xml | 7
10 files changed, 119 insertions(+), 167 deletions(-)
---
13 years, 8 months
rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 8225f8d7f634e5914fd507c1878c257577803e8c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Aug 26 15:10:49 2010 +0200
Automatic commit of package [spacewalk-schema] release [1.2.7-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 9e55762..25c6c93 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.2.6-1 schema/spacewalk/
+1.2.7-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 5d3da56..3512d72 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.2.6
+Version: 1.2.7
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -59,6 +59,14 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Thu Aug 26 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.7-1
+- 593896 - schema upgrade script rewritten to pl/sql
+- 591291 - rewrite rhnChannelNewestPackageView
+- 619337 - making it so that if a packages checksum changes, the channel it is
+ will have its repodata regenerated
+- location of schema overrides (for oracle) has changed
+- 627149 - adding upgrade script for rpm installation dates
+
* Tue Aug 24 2010 Partha Aji <paji(a)redhat.com> 1.2.6-1
- removing stray semicolon (jsherril(a)redhat.com)
13 years, 8 months