Changes to 'refs/tags/spacewalk-java-1.8.172-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.172-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-29 13:42 +0000
Tagging package [spacewalk-java] version [1.8.172-1] in directory [java/].
Changes since oracle-xe-selinux-10.2.0.33-1:
Jan Pazdziora (5):
663250 - set the Expires header for static content.
663248 - enable connection polling to tomcat.
All the Java requests end up at /rhn, no need to have separate .do and .jsp rewrites.
We just assume Apache 2.2 these days, no need to check.
Automatic commit of package [spacewalk-java] release [1.8.172-1].
---
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 16 +++++++++-------
3 files changed, 16 insertions(+), 9 deletions(-)
---
11 years, 6 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 9f43128e539c6ccecc665d86f283ed62c7de9c93
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 29 14:42:11 2012 +0100
Automatic commit of package [spacewalk-java] release [1.8.172-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 5493f09..c46d4ee 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.171
+Version: 1.8.172
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -616,6 +616,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Oct 29 2012 Jan Pazdziora 1.8.172-1
+- Change of message which is shown if no errata is available for package
+- remove unnecessary casts
+- removing @Override annotation from a method that isn't overriden
+
* Mon Oct 29 2012 Jan Pazdziora 1.8.171-1
- 869428 - last_checkin date should be displayed as UTC for splice integration
API
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f08f244..1224396 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.171-1 java/
+1.8.172-1 java/
11 years, 6 months
spacewalk/config
by Jan Pazdziora
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 6 ------
1 file changed, 6 deletions(-)
New commits:
commit 2fa1da83772925c17ff5f69e5961e258652fac90
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 29 13:38:53 2012 +0100
We just assume Apache 2.2 these days, no need to check.
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index f213261..8652000 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -61,15 +61,9 @@ AddType text/pxt .pxt
Satisfy All
</Files>
-<IfModule !mod_version.c>
-LoadModule version_module modules/mod_version.so
-</IfModule>
-
-<IfVersion >= 2.1>
<IfModule !proxy_ajp_module>
LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
</IfModule>
-</IfVersion>
# Turn rewrite engine on so we can use it for
# kickstart requests.
11 years, 6 months
2 commits - spacewalk/config
by Jan Pazdziora
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 67a21463c6920db61b5697d4e3b3775648b5d9d5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 29 13:37:06 2012 +0100
All the Java requests end up at /rhn, no need to have separate .do and .jsp rewrites.
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index bc57820..f213261 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -97,7 +97,6 @@ ProxyTimeout 210
ProxySet min=1
</Proxy>
RewriteRule ^/rhn(.*) ajp://localhost:8009/rhn$1 [P]
-RewriteRule ^(/.*\.(do|jsp)(\?.*)?)$ ajp://localhost:8009/$1 [P]
</IfModule>
RedirectMatch ^/renew/.* http://rhn.redhat.com
commit 7d9fbde0f16aa988a2b4194d4e028ef2e9a9d96e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 29 13:34:05 2012 +0100
663248 - enable connection polling to tomcat.
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 47c2570..bc57820 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -93,6 +93,9 @@ RewriteRule ^/WEBRPC /rhn/rpc/api
ProxyTimeout 210
<IfModule proxy_ajp_module>
+<Proxy ajp://localhost:8009>
+ ProxySet min=1
+</Proxy>
RewriteRule ^/rhn(.*) ajp://localhost:8009/rhn$1 [P]
RewriteRule ^(/.*\.(do|jsp)(\?.*)?)$ ajp://localhost:8009/$1 [P]
</IfModule>
11 years, 6 months
spacewalk/config
by Jan Pazdziora
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit de96e1065391cd6bbd85f4fcbbf9dd8e8cecacbb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 29 11:28:49 2012 +0100
663250 - set the Expires header for static content.
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index fca82e3..47c2570 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -3,6 +3,12 @@
AllowOverride All
Order allow,deny
Allow from all
+
+ ExpiresActive On
+ <FilesMatch "\.(js|css|ico|gif|png|pdf)$">
+ ExpiresDefault A86400
+ Header append Cache-Control "public"
+ </FilesMatch>
</Directory>
PerlTaintCheck Off
11 years, 6 months
Changes to 'refs/tags/oracle-xe-selinux-10.2.0.33-1'
by Jan Pazdziora
Tag 'oracle-xe-selinux-10.2.0.33-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-29 09:42 +0000
Tagging package [oracle-xe-selinux] version [10.2.0.33-1] in directory [selinux/oracle-xe-selinux/].
Changes since spacewalk-java-1.8.171-1:
Jan Pazdziora (2):
Setsebool without -P is rarely needed.
Automatic commit of package [oracle-xe-selinux] release [10.2.0.33-1].
Tomas Kasparek (1):
Change of message which is shown if no errata is available for package
Tomas Lestach (2):
removing @Override annotation from a method that isn't overriden
remove unnecessary casts
---
java/code/src/com/redhat/rhn/domain/action/script/test/ScriptRunActionTest.java | 2 +-
java/code/src/com/redhat/rhn/domain/server/Server.java | 1 -
java/code/src/com/redhat/rhn/frontend/action/systems/ExtraPackagesSystemsAction.java | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java | 2 +-
java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 2 +-
rel-eng/packages/oracle-xe-selinux | 2 +-
selinux/oracle-xe-selinux/oracle-xe-selinux-enable | 2 +-
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 5 ++++-
9 files changed, 11 insertions(+), 9 deletions(-)
---
11 years, 6 months
2 commits - rel-eng/packages selinux/oracle-xe-selinux
by Jan Pazdziora
rel-eng/packages/oracle-xe-selinux | 2 +-
selinux/oracle-xe-selinux/oracle-xe-selinux-enable | 2 +-
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit a200a5050f95277c860f2920256508d287ba56ea
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 29 10:42:01 2012 +0100
Automatic commit of package [oracle-xe-selinux] release [10.2.0.33-1].
diff --git a/rel-eng/packages/oracle-xe-selinux b/rel-eng/packages/oracle-xe-selinux
index d65295c..20022c08 100644
--- a/rel-eng/packages/oracle-xe-selinux
+++ b/rel-eng/packages/oracle-xe-selinux
@@ -1 +1 @@
-10.2.0.32-1 selinux/oracle-xe-selinux/
+10.2.0.33-1 selinux/oracle-xe-selinux/
diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
index 24b8f21..38ebf3e 100644
--- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
+++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
@@ -5,7 +5,7 @@
%define modulename oracle-xe
Name: oracle-xe-selinux
-Version: 10.2.0.32
+Version: 10.2.0.33
Release: 1%{?dist}
Summary: SELinux policy module supporting Oracle XE
Group: System Environment/Base
@@ -137,6 +137,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Mon Oct 29 2012 Jan Pazdziora 10.2.0.33-1
+- Setsebool without -P is rarely needed.
+
* Tue Oct 16 2012 Jan Pazdziora 10.2.0.32-1
- Lsnrctl wants to search as well.
commit 4499382710ca719c85b40480374a6be413270851
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Oct 29 10:41:15 2012 +0100
Setsebool without -P is rarely needed.
diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux-enable b/selinux/oracle-xe-selinux/oracle-xe-selinux-enable
index 3586fc1..dfa5c15 100644
--- a/selinux/oracle-xe-selinux/oracle-xe-selinux-enable
+++ b/selinux/oracle-xe-selinux/oracle-xe-selinux-enable
@@ -9,7 +9,7 @@ for selinuxvariant in mls strict targeted
done
/usr/sbin/semanage port -a -t oracle_port_t -p tcp 9055 || :
-/usr/sbin/getsebool oracle_11g_support > /dev/null 2>&1 && /usr/sbin/setsebool oracle_11g_support 1
+/usr/sbin/getsebool oracle_11g_support > /dev/null 2>&1 && /usr/sbin/setsebool -P oracle_11g_support 1
# Relabel oracle-xe's files
rpm -qlf /etc/init.d/oracle-xe | xargs -n 100 /sbin/restorecon -Rivv
11 years, 6 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0139e30886b80f70da4b901a00a133159ff894c0
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Oct 29 10:32:43 2012 +0100
Change of message which is shown if no errata is available for package
89761c4952df4b549beefccf1ecf34fa37f2891e - original commit
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index d687fac..e278903 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -20464,7 +20464,7 @@ given channel.</source>
</trans-unit>
<trans-unit id="package.jsp.errataunavailable">
- <source>No errata are available for this package</source>
+ <source>This package is not linked to any erratum</source>
</trans-unit>
<trans-unit id="package.jsp.sunosrelease">
11 years, 6 months
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/action/script/test/ScriptRunActionTest.java | 2 +-
java/code/src/com/redhat/rhn/domain/server/Server.java | 1 -
java/code/src/com/redhat/rhn/frontend/action/systems/ExtraPackagesSystemsAction.java | 2 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java | 2 +-
java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 2 +-
5 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit add6b6c4784bfbce6cbba29a01cbaa93e6429a13
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Oct 29 09:29:41 2012 +0100
remove unnecessary casts
diff --git a/java/code/src/com/redhat/rhn/domain/action/script/test/ScriptRunActionTest.java b/java/code/src/com/redhat/rhn/domain/action/script/test/ScriptRunActionTest.java
index 12aa072..158b29c 100644
--- a/java/code/src/com/redhat/rhn/domain/action/script/test/ScriptRunActionTest.java
+++ b/java/code/src/com/redhat/rhn/domain/action/script/test/ScriptRunActionTest.java
@@ -136,7 +136,7 @@ public class ScriptRunActionTest extends RhnBaseTestCase {
ScriptRunAction scriptaction = (ScriptRunAction) a;
assertEquals(1, scriptaction.getScriptActionDetails().getResults().size());
- ScriptResult lookupResult = (ScriptResult)scriptaction.getScriptActionDetails().
+ ScriptResult lookupResult = scriptaction.getScriptActionDetails().
getResults().iterator().next();
assertEquals(startDate.getTime() / 1000,
lookupResult.getStartDate().getTime() / 1000);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/ExtraPackagesSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/ExtraPackagesSystemsAction.java
index c009741..cc246fe 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/ExtraPackagesSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/ExtraPackagesSystemsAction.java
@@ -46,6 +46,6 @@ public class ExtraPackagesSystemsAction extends BaseSystemsAction {
protected DataResult<SystemOverview> getDataResult(User user, PageControl pc,
ActionForm formIn) {
- return (DataResult<SystemOverview>) SystemManager.getExtraPackagesSystems(user, pc);
+ return SystemManager.getExtraPackagesSystems(user, pc);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
index 5a6a21c..5655066 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
@@ -792,7 +792,7 @@ public class SystemHandlerTest extends BaseHandlerTestCase {
assertTrue(sizeAfter > sizeBefore);
// Test
- Note deleteMe = (Note) server.getNotes().iterator().next();
+ Note deleteMe = server.getNotes().iterator().next();
result = handler.deleteNote(adminKey, server.getId().intValue(),
deleteMe.getId().intValue());
diff --git a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
index 93ac610..d987cbc 100644
--- a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java
@@ -994,7 +994,7 @@ public class SystemManagerTest extends RhnBaseTestCase {
int sizeAfter = server.getNotes().size();
assertTrue(sizeAfter == (sizeBefore + 1));
- Note deleteMe = (Note) server.getNotes().iterator().next();
+ Note deleteMe = server.getNotes().iterator().next();
// Test
SystemManager.deleteNote(admin, server.getId(), deleteMe.getId());
commit 259d13377de2a545f2aeee7fe994f1382ec0ba88
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Oct 29 09:27:43 2012 +0100
removing @Override annotation from a method that isn't overriden
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java
index 77de965..d71866f 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -402,7 +402,6 @@ public class Server extends BaseDomainHelper implements Identifiable {
*
* @return Long to get
*/
- @Override
public Long getId() {
return this.id;
}
11 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.8.171-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.171-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-10-29 08:26 +0000
Tagging package [spacewalk-java] version [1.8.171-1] in directory [java/].
Changes since spacewalk-1.8.6-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.8.171-1].
Stephen Herr (1):
869428 - last_checkin date should be displayed as UTC for splice integration API
Tomas Kasparek (1):
WebUI - link to erratas that affect package on its overview page
---
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java | 3 +
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 26 ++++++++--
java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp | 12 +++-
java/spacewalk-java.spec | 7 ++
rel-eng/packages/spacewalk-java | 2
6 files changed, 43 insertions(+), 11 deletions(-)
---
11 years, 6 months