projects/oracle-lib-compat
by Jan Pazdziora
projects/oracle-lib-compat/tomcat-setenv.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 3e5fd863b076ab611d0beb53a295b2d8e08f3ae0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Sep 23 08:59:29 2010 +0200
623115 - file lookup using just the linker name (libldap.so) fails if openldap-devel is not installed.
We shall find the soname path using the dynamic linker.
diff --git a/projects/oracle-lib-compat/tomcat-setenv.sh b/projects/oracle-lib-compat/tomcat-setenv.sh
index 526226f..bb181a3 100644
--- a/projects/oracle-lib-compat/tomcat-setenv.sh
+++ b/projects/oracle-lib-compat/tomcat-setenv.sh
@@ -1,10 +1,10 @@
# To address bug 623115/627859, we need to override the ldap_* symbols
# in libclntsh.so* upon tomcat5 startup with those from standard library.
-if [ -f /usr/lib64/libldap.so ] ; then
- LD_PRELOAD=/usr/lib64/libldap.so
-else
- LD_PRELOAD=/usr/lib/libldap.so
-fi
-export LD_PRELOAD
+for i in /lib64/security/pam_ldap.so /lib/security/pam_ldap.so ; do
+ if [ -f $i ] ; then
+ export LD_PRELOAD=`ldd $i | perl -lne '/^\s+libldap\S+\s+=>\s+(\S+)/ and print $1 and exit'`
+ break
+ fi
+done
13 years, 7 months
Changes to 'refs/tags/spacewalk-java-1.2.43-1'
by Lukas Zapletal
Tag 'spacewalk-java-1.2.43-1' created by Lukas Zapletal <lzap+git(a)redhat.com> at 2010-09-23 06:30 +0000
Tagging package [spacewalk-java] version [1.2.43-1] in directory [java/].
Changes since spacecmd-0.6.2-1:
Justin Sherrill (1):
634230 - fixing slowness in email sending
Lukas Zapletal (4):
630585 - about-chat string correction (Spacewalk)
checkstyle fix
636740 - asterisks in package search fixed
Automatic commit of package [spacewalk-java] release [1.2.43-1].
Milan Zazrivec (1):
make 'db-control report' report TEMP_TBS statistics
Partha Aji (5):
634263 - Fix to allow guests to register across orgs + UI fixes for the Virtual systems page
636587- Fixed a query showing the system counts in the Software Entitleements page
636653 - Made the Channel Family Subscribed Systems page show guest systems also
630877 - XMLRPC Documentation fix
636120-Fixed an ISE in the org.listSystemEntitlements call to deal with null Used/Allocated entitlements
---
backend/server/rhnVirtualization.py | 8
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 7
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 7
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 12 -
java/code/src/com/redhat/rhn/frontend/action/help/ChatAction.java | 18 +
java/code/src/com/redhat/rhn/frontend/dto/MultiOrgEntitlementsDto.java | 25 ++
java/code/src/com/redhat/rhn/frontend/dto/VirtualSystemOverview.java | 28 ++
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml | 1
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 112 +++++++--
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 1
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java | 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 4
java/code/webapp/WEB-INF/pages/systems/details/virtualization/virtualguestslist.jsp | 12 -
java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp | 28 +-
java/spacewalk-java.spec | 14 +
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/common/data/rhnChannelArch.sql | 3
web/modules/dobby/Dobby/CLI/MiscCommands.pm | 10
web/modules/dobby/Dobby/Reporting.pm | 19 +
web/modules/dobby/scripts/check-oracle-space-usage.sh | 2
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 1
38 files changed, 1567 insertions(+), 454 deletions(-)
---
13 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by Lukas Zapletal
java/spacewalk-java.spec | 14 +++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 2df0dfe322fc0f6feaae1040a11bffeaa9c99135
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Sep 23 08:30:39 2010 +0200
Automatic commit of package [spacewalk-java] release [1.2.43-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 70b13bd..ca770e4 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.42
+Version: 1.2.43
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -336,6 +336,18 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Sep 23 2010 Lukas Zapletal 1.2.43-1
+- 636740 - asterisks in package search fixed
+- 636120 - fixed an ISE in the org.listSystemEntitlements call to deal with null
+ Used/Allocated entitlements
+- 630877 - XMLRPC Documentation fix
+- 634230 - fixing slowness in email sending
+- 636587- Fixed a query showing the system counts in the Software Entitleements
+ page
+- 630585 - about-chat string correction
+- 634263 - Fix to allow guests to register across orgs + UI fixes for the
+ Virtual systems page
+
* Tue Sep 21 2010 Aron Parsons <aparsons(a)redhat.com> 1.2.42-1
- added new API call channel.software.removeErrata (aparsons(a)redhat.com)
- 591291 - added new API calls channel.software.mergeErrataWithPackages
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index fe697e8..64b484a 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.42-1 java/
+1.2.43-1 java/
13 years, 7 months
2 commits - java/code schema/spacewalk
by Lukas Zapletal
java/code/src/com/redhat/rhn/frontend/action/help/ChatAction.java | 18 +
java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml | 1
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 112 +++++++--
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 113 +++++++---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 1
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 1
java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml | 1
schema/spacewalk/common/data/rhnChannelArch.sql | 3
22 files changed, 1429 insertions(+), 403 deletions(-)
New commits:
commit 229e868e33618828358c81555460a6ce8f5f79c0
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Sep 23 08:14:57 2010 +0200
636740 - asterisks in package search fixed
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
index 3cafdaa..c901087 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml
@@ -1,3 +1,4 @@
+<!-- vim: set et ts=2 sw=2 ai: -->
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.1"
xmlns:xyz="urn:appInfo:Items"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
index 48e6c1d..2c7cc82 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
@@ -8299,30 +8299,93 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
<target>এই কর্ম সঞ্চালনের জন্য আপনার পর্যাপ্ত অনুমতি নেই।</target></trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- <target>IA-32</target></trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- <target>IA-64</target></trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- <target>s390</target></trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- <target>s390x</target></trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- <target>x86_64</target></trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- <target>PPC</target></trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- <target>Sparc Solaris</target></trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- <target>i386 Solaris</target></trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
@@ -8662,4 +8725,4 @@ tree will not be usable for kickstarting.
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
index 1b73b70..5bf2690 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
@@ -8324,30 +8324,93 @@ Folgen Sie dieser URL f&uuml;r die vollst&auml;ndige Liste inaktiver Sys
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
<target>Sie besitzen nicht gen&uuml;gend Berechtigungen, um diese Aktion durchzuf&uuml;hren.</target></trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- <target>IA-32</target></trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- <target>IA-64</target></trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- <target>s390</target></trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- <target>s390x</target></trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- <target>x86_64</target></trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- <target>PPC</target></trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- <target>Sparc Solaris</target></trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- <target>i386 Solaris</target></trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
@@ -8703,4 +8766,4 @@ Kickstart-Baum für Kickstarts unbrauchbar sein.
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
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 fd09f34..2fd88cc 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
@@ -1,3 +1,4 @@
+<!-- vim: set et ts=2 sw=2 ai: -->
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.1"
xmlns:xyz="urn:appInfo:Items"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -8301,30 +8302,93 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
</trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- </trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- </trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- </trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- </trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- </trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- </trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- </trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- </trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
index 710ac66..166576c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
@@ -8324,30 +8324,93 @@ Vaya a esta dirección para ver la lista completa de sistemas inactivos:
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
<target>No tiene suficientes permisos para ejecutar esta acción.</target></trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- <target>IA-32</target></trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- <target>IA-64</target></trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- <target>s390</target></trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- <target>s390x</target></trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- <target>x86_64</target></trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- <target>PPC</target></trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- <target>Sparc Solaris</target></trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- <target>i386 Solaris</target></trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
@@ -8703,4 +8766,4 @@ no podrá ser usado para instalaciones kickstart.
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
index 0ab1558..8447889 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
@@ -8326,30 +8326,93 @@ Suivez cet url pour obtenir la liste complète des systèmes inactifs :
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
<target>Vous ne disposez pas de suffisamment de permissions pour effectuer cette action.</target></trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- <target>IA-32</target></trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- <target>IA-64</target></trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- <target>s390</target></trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- <target>s390x</target></trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- <target>x86_64</target></trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- <target>PPC</target></trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- <target>Sparc Solaris</target></trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- <target>i386 Solaris</target></trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
@@ -8704,4 +8767,4 @@ ne sera pas utilisable pour kickstarting.
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
index fb47874..918b507 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
@@ -8299,30 +8299,93 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
<target>આ ક્રિયા કરવા માટે તમારી પાસે પૂરતી પરવાનગીઓ નથી.</target></trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- <target>IA-32</target></trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- <target>IA-64</target></trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- <target>s390</target></trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- <target>s390x</target></trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- <target>x86_64</target></trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- <target>PPC</target></trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- <target>Sparc Solaris</target></trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- <target>i386 Solaris</target></trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
@@ -8662,4 +8725,4 @@ tree will not be usable for kickstarting.
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
index 053ddd1..fd15fb4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
@@ -8299,30 +8299,93 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
<target>आपको इस कार्य को करने के लिए पर्याप्त अनुमति नहीं है.</target></trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- <target>IA-32</target></trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- <target>IA-64</target></trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- <target>s390</target></trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- <target>s390x</target></trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- <target>x86_64</target></trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- <target>PPC</target></trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- <target>Sparc Solaris</target></trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- <target>i386 Solaris</target></trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
@@ -8662,4 +8725,4 @@ tree will not be usable for kickstarting.
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
index e7c8d10..417ebf5 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
@@ -8323,30 +8323,93 @@ Seguite l'url sotto riportato per visualizzare l'elenco completo di sistemi inat
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
<target>Non siete in possesso dei permessi richiesti per eseguire questa azione.</target></trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- <target>IA-32</target></trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- <target>IA-64</target></trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- <target>s390</target></trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- <target>s390x</target></trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- <target>x86_64</target></trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- <target>PPC</target></trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- <target>Sparc Solaris</target></trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- <target>i386 Solaris</target></trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
@@ -8686,4 +8749,4 @@ tree will not be usable for kickstarting.
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
index a627b9a..46def3d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
@@ -8323,30 +8323,93 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
<target>このアクションを実行するのに十分な権限がありません。</target></trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- <target>IA-32</target></trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- <target>IA-64</target></trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- <target>s390</target></trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- <target>s390x</target></trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- <target>x86_64</target></trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- <target>PPC</target></trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- <target>Sparc Solaris</target></trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- <target>i386 Solaris</target></trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
@@ -8702,4 +8765,4 @@ Spacewalk がキックスタートディストリビューションを Spacewalk
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
index 4991973..4276d11 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
@@ -8299,30 +8299,93 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
<target>이 작업을 실행할 수 있는 권한이 없습니다. </target></trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- <target>IA-32</target></trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- <target>IA-64</target></trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- <target>s390</target></trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- <target>s390x</target></trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- <target>x86_64</target></trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- <target>PPC</target></trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- <target>Sparc Solaris</target></trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- <target>i386 Solaris</target></trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
@@ -8662,4 +8725,4 @@ tree will not be usable for kickstarting.
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
index 729defa..7b23a45 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
@@ -8301,30 +8301,93 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
<target>ਤੁਹਾਡੇ ਕੋਲ ਇਹ ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਲੋੜੀਂਦੇ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।</target></trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- <target>IA-32</target></trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- <target>IA-64</target></trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- <target>s390</target></trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- <target>s390x</target></trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- <target>x86_64</target></trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- <target>PPC</target></trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- <target>Sparc Solaris</target></trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- <target>i386 Solaris</target></trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
@@ -8664,4 +8727,4 @@ tree will not be usable for kickstarting.
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
index a42accc..216cdec 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
@@ -8311,30 +8311,93 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
<target>Você não possui permissões suficientes para realizar esta ação.</target></trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- <target>IA-32</target></trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- <target>IA-64</target></trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- <target>s390</target></trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- <target>s390x</target></trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- <target>x86_64</target></trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- <target>PPC</target></trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- <target>Sparc Solaris</target></trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- <target>i386 Solaris</target></trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
@@ -8687,4 +8750,4 @@ do kickstart não será usada para o kickstarting.
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
index 3fb8457..cf462db 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
@@ -8299,30 +8299,93 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
<target>У вас нет полномочий для выполнения этого действия.</target></trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- <target>IA-32</target></trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- <target>IA-64</target></trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- <target>s390</target></trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- <target>s390x</target></trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- <target>x86_64</target></trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- <target>PPC</target></trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- <target>Sparc Solaris</target></trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- <target>i386 Solaris</target></trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
@@ -8662,4 +8725,4 @@ tree will not be usable for kickstarting.
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
index f538282..071294d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
@@ -8299,30 +8299,93 @@ url பின்பற்றி செயலிழக்கப்பட்ட
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
<target>இந்த செயலை செய்ய உங்களுக்கு போதிய அனுமதிகள் இல்லை.</target></trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- <target>IA-32</target></trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- <target>IA-64</target></trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- <target>s390</target></trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- <target>s390x</target></trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- <target>x86_64</target></trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- <target>PPC</target></trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- <target>Sparc Solaris</target></trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- <target>i386 Solaris</target></trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
@@ -8662,4 +8725,4 @@ tree will not be usable for kickstarting.
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
index 756044d..a4b4bbc 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
@@ -8324,30 +8324,93 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
<target>您没有足够的权限执行此动作。</target></trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- <target>IA-32</target></trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- <target>IA-64</target></trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- <target>s390</target></trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- <target>s390x</target></trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- <target>x86_64</target></trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- <target>PPC</target></trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- <target>Sparc Solaris</target></trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- <target>i386 Solaris</target></trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
@@ -8703,4 +8766,4 @@ Kickstart 树将不可用。
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
index 22992c1..b8551fc 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
@@ -8298,30 +8298,93 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="frontend.actions.channels.manager.add.permsfailure">
<source>You do not have sufficient permissions to perform this action.</source>
<target>您沒有足夠的權限進行這項工作。</target></trans-unit>
- <trans-unit id="IA-32">
- <source>IA-32</source>
- <target>IA-32</target></trans-unit>
- <trans-unit id="IA-64">
- <source>IA-64</source>
- <target>IA-64</target></trans-unit>
- <trans-unit id="s390">
- <source>s390</source>
- <target>s390</target></trans-unit>
- <trans-unit id="s390x">
- <source>s390x</source>
- <target>s390x</target></trans-unit>
- <trans-unit id="x86_64">
- <source>x86_64</source>
- <target>x86_64</target></trans-unit>
- <trans-unit id="PPC">
- <source>PPC</source>
- <target>PPC</target></trans-unit>
- <trans-unit id="Sparc Solaris">
- <source>Sparc Solaris</source>
- <target>Sparc Solaris</target></trans-unit>
- <trans-unit id="i386 Solaris">
- <source>i386 Solaris</source>
- <target>i386 Solaris</target></trans-unit>
+
+ <!-- The following resources need to be updated for each
+ schema change (see rhnChannelArch.sql) -->
+ <trans-unit id="IA-32">
+ <source>IA-32</source>
+ <target>IA-32</target>
+ </trans-unit>
+ <trans-unit id="IA-32 Debian">
+ <source>IA-32 Debian</source>
+ <target>IA-32 Debian</target>
+ </trans-unit>
+ <trans-unit id="IA-64">
+ <source>IA-64</source>
+ <target>IA-64</target>
+ </trans-unit>
+ <trans-unit id="IA-64 Debian">
+ <source>IA-64 Debian</source>
+ <target>IA-64 Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc">
+ <source>Sparc</source>
+ <target>Sparc</target>
+ </trans-unit>
+ <trans-unit id="Sparc Debian">
+ <source>Sparc Debian</source>
+ <target>Sparc Debian</target>
+ </trans-unit>
+ <trans-unit id="Alpha">
+ <source>Alpha</source>
+ <target>Alpha</target>
+ </trans-unit>
+ <trans-unit id="Alpha Debian">
+ <source>Alpha Debian</source>
+ <target>Alpha Debian</target>
+ </trans-unit>
+ <trans-unit id="s390">
+ <source>s390</source>
+ <target>s390</target>
+ </trans-unit>
+ <trans-unit id="s390 Debian">
+ <source>s390 Debian</source>
+ <target>s390 Debian</target>
+ </trans-unit>
+ <trans-unit id="s390x">
+ <source>s390x</source>
+ <target>s390x</target>
+ </trans-unit>
+ <trans-unit id="iSeries">
+ <source>iSeries</source>
+ <target>iSeries</target>
+ </trans-unit>
+ <trans-unit id="pSeries">
+ <source>pSeries</source>
+ <target>pSeries</target>
+ </trans-unit>
+ <trans-unit id="x86_64">
+ <source>x86_64</source>
+ <target>x86_64</target>
+ </trans-unit>
+ <trans-unit id="AMD64 Debian">
+ <source>AMD64 Debian</source>
+ <target>AMD64 Debian</target>
+ </trans-unit>
+ <trans-unit id="PPC">
+ <source>PPC</source>
+ <target>PPC</target>
+ </trans-unit>
+ <trans-unit id="PowerPC Debian">
+ <source>PowerPC Debian</source>
+ <target>PowerPC Debian</target>
+ </trans-unit>
+ <trans-unit id="arm Debian">
+ <source>arm Debian</source>
+ <target>arm Debian</target>
+ </trans-unit>
+ <trans-unit id="mips Debian">
+ <source>mips Debian</source>
+ <target>mips Debian</target>
+ </trans-unit>
+ <trans-unit id="Sparc Solaris">
+ <source>Sparc Solaris</source>
+ <target>Sparc Solaris</target>
+ </trans-unit>
+ <trans-unit id="i386 Solaris">
+ <source>i386 Solaris</source>
+ <target>i386 Solaris</target>
+ </trans-unit>
<trans-unit id="channel.manage.patchset.deleteconfirm">
<source>{0} patch cluster(s) have been removed from this channel</source>
@@ -8661,4 +8724,4 @@ tree will not be usable for kickstarting.
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
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 37d3577..48bbd6c 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
@@ -1,3 +1,4 @@
+<!-- vim: set et ts=2 sw=2 ai: -->
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.1"
xmlns:xyz="urn:appInfo:Items"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
index 9561a3a..29afad1 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
@@ -1,3 +1,4 @@
+<!-- vim: set et ts=2 sw=2 ai: -->
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.1"
xmlns:xyz="urn:appInfo:Items"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
index c7425b4..6e7d2dc 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/template/StringResource_en_US.xml
@@ -1,3 +1,4 @@
+<!-- vim: set et ts=2 sw=2 ai: -->
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.1"
xmlns:xyz="urn:appInfo:Items"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/schema/spacewalk/common/data/rhnChannelArch.sql b/schema/spacewalk/common/data/rhnChannelArch.sql
index ace6f52..a33891a 100644
--- a/schema/spacewalk/common/data/rhnChannelArch.sql
+++ b/schema/spacewalk/common/data/rhnChannelArch.sql
@@ -15,6 +15,9 @@
--
--
--
+--
+-- Please note when adding new architectures also update the file
+-- StringResource_*.xml (search for rhnChannelArch.sql comment).
insert into rhnChannelArch (id, label, name, arch_type_id) values
(rhn_channel_arch_id_seq.nextval, 'channel-ia32', 'IA-32', lookup_arch_type('rpm'));
commit d03f011672cf5bd4d52c139dadfb40bdbc6dbad0
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Wed Sep 22 10:23:49 2010 +0200
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/frontend/action/help/ChatAction.java b/java/code/src/com/redhat/rhn/frontend/action/help/ChatAction.java
index 0f6e8cf..d652d0d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/help/ChatAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/help/ChatAction.java
@@ -1,9 +1,19 @@
+/**
+ * Copyright (c) 2009--2010 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.frontend.action.help;
-import com.redhat.rhn.common.conf.Config;
-import com.redhat.rhn.common.conf.ConfigDefaults;
-import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.struts.RequestContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts.action.ActionForm;
13 years, 7 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/frontend/dto/MultiOrgEntitlementsDto.java | 25 +++++++++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java | 4 -
2 files changed, 26 insertions(+), 3 deletions(-)
New commits:
commit 5634080ad94668c3b1e73262df011d30715c1f26
Author: Partha Aji <paji(a)redhat.com>
Date: Wed Sep 22 18:21:03 2010 -0400
636120-Fixed an ISE in the org.listSystemEntitlements call to deal with null Used/Allocated entitlements
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/MultiOrgEntitlementsDto.java b/java/code/src/com/redhat/rhn/frontend/dto/MultiOrgEntitlementsDto.java
index 79797e9..b40b4b0 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/MultiOrgEntitlementsDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/MultiOrgEntitlementsDto.java
@@ -93,6 +93,17 @@ public class MultiOrgEntitlementsDto extends BaseDto {
/**
+ * @return the free
+ */
+ public Long getFree() {
+ if (getUsed() == null) {
+ getAllocated();
+ }
+
+ return getAllocated() - getUsed();
+ }
+
+ /**
* @return the ratio of current: allocated
*/
public BigDecimal getRatio() {
@@ -201,7 +212,7 @@ public class MultiOrgEntitlementsDto extends BaseDto {
* @return the number of used slots.
*/
public Long getAllocatedFlex() {
- if (getTotal() == null || getAvailable() == null) {
+ if (getTotalFlex() == null || getAvailableFlex() == null) {
return 0L;
}
return getTotalFlex() - getAvailableFlex();
@@ -219,4 +230,16 @@ public class MultiOrgEntitlementsDto extends BaseDto {
}
return BigDecimal.ZERO;
}
+
+ /**
+ * @return the free flex
+ */
+ public Long getFreeFlex() {
+ if (getUsedFlex() == null) {
+ return getAllocatedFlex();
+ }
+
+ return getAllocatedFlex() - getUsedFlex();
+ }
+
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java
index 9c54f87..07359c8 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/MultiOrgEntitlementsDtoSerializer.java
@@ -66,11 +66,11 @@ public class MultiOrgEntitlementsDtoSerializer implements
helper.add("allocated", dto.getAllocated());
helper.add("unallocated", dto.getAvailable());
helper.add("used", dto.getUsed());
- helper.add("free", dto.getAllocated() - dto.getUsed());
+ helper.add("free", dto.getFree());
helper.add("allocated_flex", dto.getAllocatedFlex());
helper.add("unallocated_flex", dto.getAvailableFlex());
helper.add("used_flex", dto.getUsedFlex());
- helper.add("free_flex", dto.getAllocatedFlex() - dto.getUsedFlex());
+ helper.add("free_flex", dto.getFreeFlex());
helper.writeTo(output);
}
13 years, 7 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a27c4483e2ac7351bb831b30f6eab883dcba0a95
Author: Partha Aji <paji(a)redhat.com>
Date: Wed Sep 22 17:03:42 2010 -0400
630877 - XMLRPC Documentation fix
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 918b7a6..4e2c1b5 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -4405,7 +4405,7 @@ public class SystemHandler extends BaseHandler {
* for the specified server.
* Note: This call assumes that a system record exists in cobbler for the
* given system and will raise an XMLRPC fault if that is not the case.
- * To create a system record over xmlrpc use system.create_system_record
+ * To create a system record over xmlrpc use system.createSystemRecord
*
* To create a system record in the Web UI please go to
* System -> <Specified System> -> Provisioning ->
@@ -4467,7 +4467,7 @@ public class SystemHandler extends BaseHandler {
* for the specified server.
* Note: This call assumes that a system record exists in cobbler for the
* given system and will raise an XMLRPC fault if that is not the case.
- * To create a system record over xmlrpc use system.create_system_record
+ * To create a system record over xmlrpc use system.createSystemRecord
*
* To create a system record in the Web UI please go to
* System -> <Specified System> -> Provisioning ->
13 years, 7 months
web/modules
by Partha Aji
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 7056409916495c6ca917b8a326e4025f9dad6b36
Author: Partha Aji <paji(a)redhat.com>
Date: Wed Sep 22 15:57:33 2010 -0400
636653 - Made the Channel Family Subscribed Systems page show guest systems also
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index a86912d..1347fb5 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -880,7 +880,6 @@ SELECT distinct S.id, S.name
AND SC.channel_id = CFM.channel_id
AND CFM.channel_family_id = :cfam_id
AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND USP.server_id = S.id)
- AND NOT EXISTS (SELECT 1 FROM rhnVirtualInstance vi WHERE vi.VIRTUAL_SYSTEM_ID = S.id AND EXISTS ( SELECT 1 FROM rhnServerEntitlementView sev WHERE vi.HOST_SYSTEM_ID = sev.server_id AND sev.label IN ('virtualization_host', 'virtualization_host_platform')))
ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
13 years, 7 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 12 +++++-----
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 06541d2ef7cb34674c76e1c45c3ecbc17d68e61f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Sep 22 14:11:13 2010 -0400
634230 - fixing slowness in email sending
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 7d4d08d..9f48fdd 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
@@ -374,13 +374,13 @@ ORDER BY next_action DESC
INSERT INTO rhnPaidErrataTempCache
(user_id, server_id, errata_id)
SELECT urn.user_id, snv.server_id, snv.errata_id
- FROM rhnServerNeededView snv
- JOIN rhnUserReceiveNotifications urn
- ON snv.org_id = urn.org_id
- AND snv.server_id = urn.server_id
- WHERE snv.channel_id = :channel_id
+ FROM rhnServerNeededCache snv inner join
+ rhnUserReceiveNotifications urn ON snv.server_id = urn.server_id
+ inner join rhnServer S on S.id = snv.server_id inner join
+ rhnServerChannel sc on sc.server_id = S.id
+ WHERE sc.channel_id = :channel_id
AND snv.errata_id = :errata_id
- AND snv.org_id = :org_id
+ AND S.org_id = :org_id
</query>
</write-mode>
13 years, 7 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 1ffbf96ea6ff712ae723c00094cb01aa014a680d
Author: Partha Aji <paji(a)redhat.com>
Date: Wed Sep 22 12:12:42 2010 -0400
636587- Fixed a query showing the system counts in the Software Entitleements page
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index 0f7fe7e..0255e9f 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -345,9 +345,10 @@ ORDER BY UPPER(C.name)
SELECT CFO.id, CFO.name, CFO.label, CFO.current_members, CFO.max_members, CFO.has_subscription, CFO.url,
CFO.fve_current_members as current_flex, CFO.fve_max_members as max_flex,
(select count(*)
- from rhnServerChannel sc inner join
- rhnChannelFamilyMembers CFM on CFM.channel_id = sc.channel_id
- where CFM.channel_family_id = CFO.id) as subscribe_count
+ from rhnServerChannel sc
+ inner join rhnChannelFamilyMembers CFM on CFM.channel_id = sc.channel_id
+ inner join rhnServer s on s.id = sc.server_id
+ where CFM.channel_family_id = CFO.id and s.org_id = cfo.org_id) as subscribe_count
FROM rhnChannelFamilyOverview CFO
WHERE CFO.org_id = :org_id
ORDER BY CFO.name ASC
13 years, 7 months
web/modules
by Milan Zazrivec
web/modules/dobby/Dobby/CLI/MiscCommands.pm | 10 ++++++---
web/modules/dobby/Dobby/Reporting.pm | 19 +++++++++++++++---
web/modules/dobby/scripts/check-oracle-space-usage.sh | 2 -
3 files changed, 24 insertions(+), 7 deletions(-)
New commits:
commit 85563a21e26eb2d087c3a847a2712b7e064fc8c5
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Sep 22 16:23:46 2010 +0200
make 'db-control report' report TEMP_TBS statistics
diff --git a/web/modules/dobby/Dobby/CLI/MiscCommands.pm b/web/modules/dobby/Dobby/CLI/MiscCommands.pm
index a8d33e4..483feff 100644
--- a/web/modules/dobby/Dobby/CLI/MiscCommands.pm
+++ b/web/modules/dobby/Dobby/CLI/MiscCommands.pm
@@ -133,10 +133,14 @@ sub command_report {
my $class = __PACKAGE__;
for my $ts (sort { $a->{NAME} cmp $b->{NAME} } Dobby::Reporting->tablespace_overview($d)) {
+ $ts->{FREE_BYTES} = $ts->{TOTAL_BYTES} - ($ts->{USED_BYTES} or 0) unless $ts->{FREE_BYTES};
+ $ts->{USED_BYTES} = $ts->{TOTAL_BYTES} - ($ts->{FREE_BYTES} or 0) unless $ts->{USED_BYTES};
printf $fmt,
- $ts->{NAME}, $class->size_scale($ts->{TOTAL_BYTES}),
- $class->size_scale($ts->{TOTAL_BYTES} - $ts->{FREE_BYTES}), $class->size_scale($ts->{FREE_BYTES}),
- sprintf("%.0f", 100 * $ts->{PERCENT_USED});
+ $ts->{NAME},
+ $class->size_scale($ts->{TOTAL_BYTES}),
+ $class->size_scale($ts->{USED_BYTES}),
+ $class->size_scale($ts->{FREE_BYTES}),
+ sprintf("%.0f", 100 * ($ts->{USED_BYTES} / $ts->{TOTAL_BYTES}));
}
}
diff --git a/web/modules/dobby/Dobby/Reporting.pm b/web/modules/dobby/Dobby/Reporting.pm
index da97e7f..077bef8 100644
--- a/web/modules/dobby/Dobby/Reporting.pm
+++ b/web/modules/dobby/Dobby/Reporting.pm
@@ -25,20 +25,33 @@ sub tablespace_overview {
my $dbh = $dobby->sysdba_connect;
my $query = <<EOQ;
-SELECT DT.tablespace_name NAME, DT.extent_management,
- nvl(DFS.bytes,0) FREE_BYTES, nvl(DTS.bytes,0) TOTAL_BYTES,
- nvl((DTS.bytes - DFS.bytes)/DTS.bytes,1) PERCENT_USED
+SELECT DT.tablespace_name NAME, DT.extent_management, DT.contents,
+ DFS.bytes FREE_BYTES,
+ DUS.bytes USED_BYTES,
+ nvl(DTS.bytes,0) TOTAL_BYTES
FROM (SELECT tablespace_name,
SUM(bytes) bytes
FROM dba_free_space
GROUP BY tablespace_name) DFS,
+ (SELECT u.tablespace,
+ sum(u.blocks* p.value) bytes
+ FROM v\$tempseg_usage u,
+ v\$parameter p
+ WHERE p.name = 'db_block_size'
+ GROUP BY u.tablespace) DUS,
(SELECT tablespace_name,
SUM(bytes) bytes
FROM dba_data_files
+ GROUP BY tablespace_name
+ UNION
+ SELECT tablespace_name,
+ SUM(bytes) bytes
+ FROM dba_temp_files
GROUP BY tablespace_name) DTS,
DBA_TABLESPACES DT
WHERE DFS.tablespace_name (+) = DTS.tablespace_name
AND DTS.tablespace_name = DT.tablespace_name
+ AND DUS.tablespace (+) = DTS.tablespace_name
ORDER BY DT.tablespace_name
EOQ
diff --git a/web/modules/dobby/scripts/check-oracle-space-usage.sh b/web/modules/dobby/scripts/check-oracle-space-usage.sh
index 71285d4..38cf37d 100755
--- a/web/modules/dobby/scripts/check-oracle-space-usage.sh
+++ b/web/modules/dobby/scripts/check-oracle-space-usage.sh
@@ -16,7 +16,7 @@ export PATH
reportusage() {
# don't report UNDO usage
- /sbin/runuser oracle -c "db-control report" | grep -v UNDO
+ /sbin/runuser oracle -c "db-control report" | egrep -v 'UNDO|TEMP'
}
mailitout() {
13 years, 7 months