Changes to 'refs/tags/spacewalk-java-2.1.66-1'
by Michael Mraka
Tag 'spacewalk-java-2.1.66-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-11-06 09:12 +0000
Tagging package [spacewalk-java] version [2.1.66-1] in directory [java/].
Changes since spacewalk-java-2.1.65-1:
Johannes Renner (1):
Reorder snippet tabs
Mark Huth (1):
BZ1025626 - Prevent NPE with system.getDetails() API call for virtual systems with no virtualization type
Michael Mraka (2):
1024395 - modified query to work better with PostgreSQL 8.4 optimizer
Automatic commit of package [spacewalk-java] release [2.1.66-1].
Silvio Moioli (1):
Broken link in SSM index fixed
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 9 ++++++++-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java | 8 +++++++-
java/code/webapp/WEB-INF/nav/snippet_tabs.xml | 6 +++---
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
16 files changed, 48 insertions(+), 28 deletions(-)
---
10 years, 5 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 9 ++++++++-
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 17 insertions(+), 3 deletions(-)
New commits:
commit c60a633b442607eb5c5e789dd521cb7f3b470f1d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 6 10:12:23 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.66-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index e88f31a..f801a29 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: 2.1.65
+Version: 2.1.66
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Nov 06 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.66-1
+- 1024395 - modified query to work better with PostgreSQL 8.4 optimizer
+- Reorder snippet tabs
+- Broken link in SSM index fixed
+- 1025626 - Prevent NPE with system.getDetails() API call for virtual systems
+ with no virtualization type
+
* Mon Nov 04 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.65-1
- 1023482 - spped up /rhn/channels/manage/errata/AddRedHatErrata.do page
- Fix navigation for the default snippets page
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 380fef6..2444a70 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.65-1 java/
+2.1.66-1 java/
commit 6db02257d8fceaec60b0f70dfe20c660e593f4d4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 6 10:11:12 2013 +0100
1024395 - modified query to work better with PostgreSQL 8.4 optimizer
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index 5504c2f..214608f 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -529,16 +529,21 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
and rhnChannelNewestPackage.package_id = cp.package_id
and rhnServerChannel.server_id = csc.server_id
and cp.channel_id < rhnChannelNewestPackage.channel_id
+ and cp.channel_id = :channel_id
+-- ^ helping PostgreSQL 8.4 optimizer, see BZ#1024395 for details
)
and not exists (
-- rule out records where the server has the same package name with higher evr
- select 1 from rhnServerPackage sp, rhnPackageEVR sevr, rhnPackageUpgradeArchCompat puac
+ select 1 from rhnServerPackage sp, rhnPackageEVR sevr, rhnPackageUpgradeArchCompat puac,
+ rhnErrataPackage jep, rhnPackage jp
where rhnServerPackage.server_id = sp.server_id
and rhnServerPackage.name_id = sp.name_id
and sp.evr_id = sevr.id
and rhnPackageEVR.evr <= sevr.evr
and rhnServerPackage.package_arch_id = puac.package_arch_id
and puac.package_upgrade_arch_id = sp.package_arch_id
+ and jep.errata_id = :errata_id and jep.package_id = jp.id and jp.name_id = sp.name_id
+-- ^ helping PostgreSQL 8.4 optimizer, see BZ#1024395 for details
)
and not exists (
-- rule out records where other channel provides the same package name with higher evr
@@ -550,6 +555,8 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
and rhnPackageEVR.evr < oevr.evr
and rhnServerPackage.package_arch_id = puac.package_arch_id
and puac.package_upgrade_arch_id = ocnp.package_arch_id
+ and csc.channel_id = :channel_id
+-- ^ helping PostgreSQL 8.4 optimizer, see BZ#1024395 for details
)
--
) snv
10 years, 5 months
java/code
by StephenHerr
java/code/webapp/WEB-INF/nav/snippet_tabs.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit fd207afe0ae8a9415d96fca52167f2302df8f466
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Nov 5 08:59:57 2013 -0500
Reorder snippet tabs
diff --git a/java/code/webapp/WEB-INF/nav/snippet_tabs.xml b/java/code/webapp/WEB-INF/nav/snippet_tabs.xml
index c6c6dad..6588e91 100644
--- a/java/code/webapp/WEB-INF/nav/snippet_tabs.xml
+++ b/java/code/webapp/WEB-INF/nav/snippet_tabs.xml
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<rhn-navi-tree label="snippet_tabs" invisible="1" formvar="aid" title-depth="1"
acl_mixins="com.redhat.rhn.common.security.acl.action.ActionAclHandler">
- <rhn-tab name="cobbler.nav.default">
- <rhn-tab-url>/rhn/kickstart/cobbler/DefaultSnippetList.do</rhn-tab-url>
- </rhn-tab>
<rhn-tab name="cobbler.nav.custom">
<rhn-tab-url>/rhn/kickstart/cobbler/CustomSnippetList.do</rhn-tab-url>
</rhn-tab>
+ <rhn-tab name="cobbler.nav.default">
+ <rhn-tab-url>/rhn/kickstart/cobbler/DefaultSnippetList.do</rhn-tab-url>
+ </rhn-tab>
<rhn-tab name="cobbler.nav.all">
<rhn-tab-url>/rhn/kickstart/cobbler/CobblerSnippetList.do</rhn-tab-url>
</rhn-tab>
10 years, 5 months
java/code
by Silvio Moioli
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 ++--
11 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 278638135f90a9f2c4e09ba4d62ce8c3349e9e94
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Nov 5 13:29:46 2013 +0100
Broken link in SSM index fixed
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index 69edda6..37117d3 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -5151,8 +5151,8 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</
<target><a href="/rhn/systems/ssm/DeleteConfirm.do">Löschen</a> / <a href="/rhn/systems/ssm/misc/RebootSystem.do">Neustarten</a> von Systemen</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.migrate">
- <source><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrate</a> systems to another organization</source>
- <target><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrieren</a> von Systemen auf eine andere Organisation</target>
+ <source><a href="/rhn/systems/ssm/MigrateSystems.do">Migrate</a> systems to another organization</source>
+ <target><a href="/rhn/systems/ssm/MigrateSystems.do">Migrieren</a> von Systemen auf eine andere Organisation</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.scap">
<source><a href="/rhn/systems/ssm/audit/ScheduleXccdf.do">Audit</a> systems with OpenSCAP</source>
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 ff300b7..7e9a3de 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
@@ -4417,7 +4417,7 @@ value for this entitlement, excluding the default organization's consumption.</s
<source><a href="/rhn/systems/ssm/DeleteConfirm.do">Delete</a> / <a href="/rhn/systems/ssm/misc/RebootSystem.do">Reboot</a> systems</source>
</trans-unit>
<trans-unit id="ssm.overview.misc.migrate">
- <source><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrate</a> systems to another organization</source>
+ <source><a href="/rhn/systems/ssm/MigrateSystems.do">Migrate</a> systems to another organization</source>
</trans-unit>
<trans-unit id="ssm.overview.misc.scap">
<source><a href="/rhn/systems/ssm/audit/ScheduleXccdf.do">Audit</a> systems with OpenSCAP</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index 1c8cc47..ebb7aab 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -5150,8 +5150,8 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta
<target><a href="/rhn/systems/ssm/DeleteConfirm.do">Borrar</a> / <a href="/rhn/systems/ssm/misc/RebootSystem.do">Reboot</a> sistemas</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.migrate">
- <source><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrate</a> systems to another organization</source>
- <target><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrar</a> sistemas a otra organización.</target>
+ <source><a href="/rhn/systems/ssm/MigrateSystems.do">Migrate</a> systems to another organization</source>
+ <target><a href="/rhn/systems/ssm/MigrateSystems.do">Migrar</a> sistemas a otra organización.</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.scap">
<source><a href="/rhn/systems/ssm/audit/ScheduleXccdf.do">Audit</a> systems with OpenSCAP</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index 09bcf79..7cb29ea 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -5151,8 +5151,8 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta
<target><a href="/rhn/systems/ssm/DeleteConfirm.do">Supprimer</a> / <a href="/rhn/systems/ssm/misc/RebootSystem.do">Redémarrer</a> les systèmes</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.migrate">
- <source><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrate</a> systems to another organization</source>
- <target><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrer</a> les systèmes vers une autre organisation</target>
+ <source><a href="/rhn/systems/ssm/MigrateSystems.do">Migrate</a> systems to another organization</source>
+ <target><a href="/rhn/systems/ssm/MigrateSystems.do">Migrer</a> les systèmes vers une autre organisation</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.scap">
<source><a href="/rhn/systems/ssm/audit/ScheduleXccdf.do">Audit</a> systems with OpenSCAP</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index 034b5aa..5c26231 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -5150,8 +5150,8 @@ value for this entitlement, excluding the default organization's consumption.</s
<target><a href="/rhn/systems/ssm/DeleteConfirm.do">Cancellare</a> / <a href="/rhn/systems/ssm/misc/RebootSystem.do">Riavviare</a> i sistemi</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.migrate">
- <source><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrate</a> systems to another organization</source>
- <target><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrare</a> i sistemi ad un'altra organizzazione</target>
+ <source><a href="/rhn/systems/ssm/MigrateSystems.do">Migrate</a> systems to another organization</source>
+ <target><a href="/rhn/systems/ssm/MigrateSystems.do">Migrare</a> i sistemi ad un'altra organizzazione</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.scap">
<source><a href="/rhn/systems/ssm/audit/ScheduleXccdf.do">Audit</a> systems with OpenSCAP</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index d1d61c2..08780cc 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -5152,8 +5152,8 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>システムの <a href="/rhn/systems/ssm/DeleteConfirm.do">削除</a> / <a href="/rhn/systems/ssm/misc/RebootSystem.do">再起動</a> を行います</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.migrate">
- <source><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrate</a> systems to another organization</source>
- <target>システムを別の組織に<a href="/rhn/systems/ssm/misc/Index.do#migrate">移行</a> します</target>
+ <source><a href="/rhn/systems/ssm/MigrateSystems.do">Migrate</a> systems to another organization</source>
+ <target>システムを別の組織に<a href="/rhn/systems/ssm/MigrateSystems.do">移行</a> します</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.scap">
<source><a href="/rhn/systems/ssm/audit/ScheduleXccdf.do">Audit</a> systems with OpenSCAP</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index b537e1a..56c483a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -5149,8 +5149,8 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>시스템 <a href="/rhn/systems/ssm/DeleteConfirm.do">삭제</a> / <a href="/rhn/systems/ssm/misc/RebootSystem.do">재부팅</a> </target>
</trans-unit>
<trans-unit id="ssm.overview.misc.migrate">
- <source><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrate</a> systems to another organization</source>
- <target>시스템을 다른 조직으로 <a href="/rhn/systems/ssm/misc/Index.do#migrate">마이그레이션</a> </target>
+ <source><a href="/rhn/systems/ssm/MigrateSystems.do">Migrate</a> systems to another organization</source>
+ <target>시스템을 다른 조직으로 <a href="/rhn/systems/ssm/MigrateSystems.do">마이그레이션</a> </target>
</trans-unit>
<trans-unit id="ssm.overview.misc.scap">
<source><a href="/rhn/systems/ssm/audit/ScheduleXccdf.do">Audit</a> systems with OpenSCAP</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index c501547..40b1b56 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -5148,8 +5148,8 @@ value for this entitlement, excluding the default organization's consumption.</s
<target><a href="/rhn/systems/ssm/DeleteConfirm.do">Delete</a> / <a href="/rhn/systems/ssm/misc/RebootSystem.do">Reboot</a> sistemas</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.migrate">
- <source><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrate</a> systems to another organization</source>
- <target><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrar</a> sistemas para outra empresa</target>
+ <source><a href="/rhn/systems/ssm/MigrateSystems.do">Migrate</a> systems to another organization</source>
+ <target><a href="/rhn/systems/ssm/MigrateSystems.do">Migrar</a> sistemas para outra empresa</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.scap">
<source><a href="/rhn/systems/ssm/audit/ScheduleXccdf.do">Audit</a> systems with OpenSCAP</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index 69cd388..c04965b 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -5147,8 +5147,8 @@ value for this entitlement, excluding the default organization's consumption.</s
<target><a href="/rhn/systems/ssm/DeleteConfirm.do">Удаление</a> и <a href="/rhn/systems/ssm/misc/RebootSystem.do">Перезапуск</a></target>
</trans-unit>
<trans-unit id="ssm.overview.misc.migrate">
- <source><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrate</a> systems to another organization</source>
- <target><a href="/rhn/systems/ssm/misc/Index.do#migrate">Перенос</a> систем между организациями</target>
+ <source><a href="/rhn/systems/ssm/MigrateSystems.do">Migrate</a> systems to another organization</source>
+ <target><a href="/rhn/systems/ssm/MigrateSystems.do">Перенос</a> систем между организациями</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.scap">
<source><a href="/rhn/systems/ssm/audit/ScheduleXccdf.do">Audit</a> systems with OpenSCAP</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index 0fdbbdd..f8ee8c6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -5150,8 +5150,8 @@ value for this entitlement, excluding the default organization's consumption.</s
<target><a href="/rhn/systems/ssm/DeleteConfirm.do">删除</a> / <a href="/rhn/systems/ssm/misc/RebootSystem.do">重启</a> 系统</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.migrate">
- <source><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrate</a> systems to another organization</source>
- <target>将系统 <a href="/rhn/systems/ssm/misc/Index.do#migrate">迁移</a> 到另一个机构中</target>
+ <source><a href="/rhn/systems/ssm/MigrateSystems.do">Migrate</a> systems to another organization</source>
+ <target>将系统 <a href="/rhn/systems/ssm/MigrateSystems.do">迁移</a> 到另一个机构中</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.scap">
<source><a href="/rhn/systems/ssm/audit/ScheduleXccdf.do">Audit</a> systems with OpenSCAP</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index e127c50..186f6d4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -5147,8 +5147,8 @@ value for this entitlement, excluding the default organization's consumption.</s
<target><a href="/rhn/systems/ssm/DeleteConfirm.do">刪除</a> / <a href="/rhn/systems/ssm/misc/RebootSystem.do">重新啟動</a>系統</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.migrate">
- <source><a href="/rhn/systems/ssm/misc/Index.do#migrate">Migrate</a> systems to another organization</source>
- <target><a href="/rhn/systems/ssm/misc/Index.do#migrate">遷移</a>系統至其它組織</target>
+ <source><a href="/rhn/systems/ssm/MigrateSystems.do">Migrate</a> systems to another organization</source>
+ <target><a href="/rhn/systems/ssm/MigrateSystems.do">遷移</a>系統至其它組織</target>
</trans-unit>
<trans-unit id="ssm.overview.misc.scap">
<source><a href="/rhn/systems/ssm/audit/ScheduleXccdf.do">Audit</a> systems with OpenSCAP</source>
10 years, 5 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 3babf6a5e4a450f25ca8c809842d1dca0a044da0
Author: Mark Huth <mhuth(a)redhat.com>
Date: Fri Nov 1 02:25:10 2013 -0400
BZ1025626 - Prevent NPE with system.getDetails() API call for virtual systems with no virtualization type
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java
index 3473765..9e10a55 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java
@@ -178,7 +178,13 @@ public class ServerSerializer extends RhnXmlRpcCustomSerializer {
helper.add("lock_status", locked);
if (server.isVirtualGuest()) {
- helper.add("virtualization", server.getVirtualInstance().getType().getName());
+ if (server.getVirtualInstance().getType() != null) {
+ helper.add("virtualization", server.getVirtualInstance().getType().
+ getName());
+ }
+ else {
+ helper.add("virtualization", "");
+ }
}
helper.writeTo(output);
10 years, 5 months
Changes to 'refs/tags/spacewalk-java-2.1.65-1'
by Tomas Lestach
Tag 'spacewalk-java-2.1.65-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-11-04 17:57 +0000
Tagging package [spacewalk-java] version [2.1.65-1] in directory [java/].
Changes since spacewalk-java-2.1.64-1:
Johannes Renner (1):
Fix navigation for the default snippets page
Tasos Papaioannou (1):
1023482 - spped up /rhn/channels/manage/errata/AddRedHatErrata.do page
Tomas Lestach (2):
removing unnecessary casts
Automatic commit of package [spacewalk-java] release [2.1.65-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 47 +++-------
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java | 6 -
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1
java/spacewalk-java.spec | 7 +
rel-eng/packages/spacewalk-java | 2
5 files changed, 28 insertions(+), 35 deletions(-)
---
10 years, 6 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 786df11e301e4e0653f83a39d949e69486564ee4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 4 18:57:03 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.65-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 328ac1c..e88f31a 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: 2.1.64
+Version: 2.1.65
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Nov 04 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.65-1
+- 1023482 - spped up /rhn/channels/manage/errata/AddRedHatErrata.do page
+- Fix navigation for the default snippets page
+- removing unnecessary casts
+
* Mon Nov 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.64-1
- 1022279 - modified query to work better with PostgreSQL 8.4 optimizer
- 1022279 - added hints for PostgreSQL 8.4 optimizer
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 6a77c60..380fef6 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.64-1 java/
+2.1.65-1 java/
10 years, 6 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 47 +++-------
1 file changed, 17 insertions(+), 30 deletions(-)
New commits:
commit 018ba5f17f4de73abfecee493dd582161f4b0ad2
Author: Tasos Papaioannou <tpapaioa(a)redhat.com>
Date: Thu Oct 31 16:58:40 2013 +0100
1023482 - spped up /rhn/channels/manage/errata/AddRedHatErrata.do page
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
index a4a1a07..ccce0a1 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
@@ -448,36 +448,23 @@ SELECT DISTINCT E.id , E.advisory_name AS advisory,
<mode name="in_sources_for_target_package_assoc" class="com.redhat.rhn.frontend.dto.ErrataOverview">
<query params="custom_cid, user_id">
- Select DISTINCT Errata1.id , Errata1.advisory_name AS advisory,
- Errata1.update_date AS UPDATE_DATE,
- Errata1.synopsis as ADVISORY_SYNOPSIS,
- Errata1.advisory_type as ADVISORY_TYPE,
- Errata1.advisory_name AS advisory
- from
- ( Select E.*
- FROM rhnErrata E inner join
- rhnChannelErrata CE on CE.errata_id = E.id inner join
- rhnSet S on S.element = CE.channel_id inner join
- rhnErrataPackage EP on EP.errata_id = E.id inner join
- rhnPackage P on p.id = EP.package_id inner join
- rhnPackage P2 on P.name_id = P2.name_id inner join
- rhnChannelPackage CP on P2.id = CP.package_id
- where
- CP.channel_id = :custom_cid
- and S.user_id = :user_id
- and S.label = 'channels_for_errata') Errata1 left join
-
- ( SELECT CE2.errata_id as Id, CE2.channel_id
- from rhnChannelErrata CE2
- where CE2.channel_id = :custom_cid ) Errata2 on Errata1.id = Errata2.id left join
-
- ( select Cloned.original_id as clonedId
- from rhnChannelErrata CE2 inner join
- rhnErrataCloned Cloned on CE2.errata_id = cloned.id
- where CE2.channel_id = :custom_cid
- ) temp on temp.clonedId = Errata1.id
- where channel_id is null
- and temp.clonedId is null
+SELECT DISTINCT E.id, E.advisory_name AS advisory,
+ E.update_date AS UPDATE_DATE,
+ E.synopsis as ADVISORY_SYNOPSIS,
+ E.advisory_type as ADVISORY_TYPE
+ FROM rhnErrata E inner join
+ rhnChannelErrata CE on CE.errata_id = E.id inner join
+ rhnSet S on S.element = CE.channel_id inner join
+ rhnErrataPackage EP on EP.errata_id = E.id inner join
+ rhnPackage P on p.id = EP.package_id inner join
+ rhnPackage P2 on P.name_id = P2.name_id inner join
+ rhnChannelPackage CP on P2.id = CP.package_id
+ WHERE
+ CP.channel_id = :custom_cid
+ and S.user_id = :user_id
+ and S.label = 'channels_for_errata'
+ and E.id not in (select errata_id from rhnChannelErrata where channel_id = :custom_cid)
+ and E.id not in (select original_id from rhnChannelErrata CE, rhnErrataCloned EC where CE.errata_id = EC.id and CE.channel_id = :custom_cid);
</query>
</mode>
10 years, 6 months
java/code
by StephenHerr
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 6362d3df0b44a15e8c5eb01b7f2af4abe79e2db1
Author: Johannes Renner <jrenner(a)suse.de>
Date: Mon Nov 4 11:46:06 2013 -0500
Fix navigation for the default snippets page
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index cc1657e..f5feeb0 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -107,6 +107,7 @@
<rhn-tab-url>/rhn/systems/provisioning/preservation/PreservationListEdit.do</rhn-tab-url>
</rhn-tab>
<rhn-tab name="snippets.jsp.toolbar" acl="org_entitlement(rhn_provisioning); user_role(config_admin)" url="/rhn/kickstart/cobbler/CustomSnippetList.do" >
+ <rhn-tab-url>/rhn/kickstart/cobbler/DefaultSnippetList.do</rhn-tab-url>
<rhn-tab-url>/rhn/kickstart/cobbler/CobblerSnippetList.do</rhn-tab-url>
<rhn-tab-url>/rhn/kickstart/cobbler/CustomSnippetList.do</rhn-tab-url>
<rhn-tab-url>/rhn/kickstart/cobbler/CobblerSnippetEdit.do</rhn-tab-url>
10 years, 6 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 6b2c5abecc4b2c6d9e0f1acfa18dc2a6e96642a0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Nov 4 14:33:45 2013 +0100
removing unnecessary casts
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java
index b220917..87e5ec6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartScriptOrderAction.java
@@ -91,13 +91,13 @@ public class KickstartScriptOrderAction extends RhnLookupDispatchAction {
}
if (!preScripts.isEmpty()) {
if (StringUtils.isEmpty((String) formIn.get(SELECTED_PRE))) {
- String selected = ((LabelValueBean) preScripts.get(0)).getLabel();
+ String selected = preScripts.get(0).getLabel();
formIn.set(SELECTED_PRE, selected);
}
}
if (!postScripts.isEmpty()) {
if (StringUtils.isEmpty((String) formIn.get(SELECTED_POST))) {
- String selected = ((LabelValueBean) postScripts.get(0)).getLabel();
+ String selected = postScripts.get(0).getLabel();
formIn.set(SELECTED_POST, selected);
}
}
@@ -145,7 +145,7 @@ public class KickstartScriptOrderAction extends RhnLookupDispatchAction {
DynaActionForm form = (DynaActionForm) formIn;
// if its not javascript enabled, can't do much report error
if (!context.isJavaScriptEnabled()) {
- return handleNoScript(mapping, (DynaActionForm) formIn, request, response);
+ return handleNoScript(mapping, formIn, request, response);
}
Set<KickstartScript> scripts = ksdata.getScripts();
10 years, 6 months