java/scripts java/spacewalk-java.spec scripts/spelling
by Lukas Zapletal
java/scripts/spelling/HOWTO | 29 +++
java/scripts/spelling/check_gettext.sh | 33 +++
java/scripts/spelling/check_gettext_ALL.sh | 77 ++++++++
java/scripts/spelling/check_gettext_en.sh | 2
java/scripts/spelling/check_java.sh | 54 +++++
java/scripts/spelling/check_java_ALL.sh | 26 ++
java/scripts/spelling/check_java_en.sh | 2
java/scripts/spelling/ignored_en.txt | 1
java/scripts/spelling/ignored_en_GB.txt | 1
java/scripts/spelling/ignored_en_US.txt | 279 +++++++++++++++++++++++++++++
java/scripts/spelling/onlySource.xslt | 16 +
java/scripts/spelling/onlyTarget.xslt | 16 +
java/spacewalk-java.spec | 8
scripts/spelling/HOWTO | 29 ---
scripts/spelling/check_gettext.sh | 33 ---
scripts/spelling/check_gettext_ALL.sh | 77 --------
scripts/spelling/check_gettext_en.sh | 2
scripts/spelling/check_java.sh | 36 ---
scripts/spelling/check_java_ALL.sh | 26 --
scripts/spelling/check_java_en.sh | 2
scripts/spelling/ignored_en.txt | 1
scripts/spelling/ignored_en_GB.txt | 1
scripts/spelling/ignored_en_US.txt | 270 ----------------------------
scripts/spelling/onlySource.xslt | 16 -
scripts/spelling/onlyTarget.xslt | 16 -
25 files changed, 542 insertions(+), 511 deletions(-)
New commits:
commit f8926ff9cdb319cdde8c957e397ef82742342264
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Tue Oct 5 09:50:03 2010 +0200
spacewalk-java.spec now check for spelling errors. See bellow:
I have just modified the pacewalk-java.spec to check for spelling errors
in all java resources for English (XML files).
Please note if spelling error is found the build will *FAIL*. Yes,
correct. This was upon Jan P request so don't blame me :-)
You will probably need to edit the file scripts/spelling/ignore_en.txt
from time to time by appending all unknown words. The script prints all
words out in the correct form so its easy to append it. Example output
follows:
...
en_US in java/code/src/com/redhat/rhn/frontend/strings/database:
en_US in java/code/src/com/redhat/rhn/frontend/strings/java:
en_US in java/code/src/com/redhat/rhn/frontend/strings/jsp:
sysprefs
Spaecewalk
en_US in java/code/src/com/redhat/rhn/frontend/strings/nav:
en_US in java/code/src/com/redhat/rhn/frontend/strings/template:
ERROR: There are spelling errors in resources, please fix or
add the following words in the scripts/spelling/ignore_en.txt:
--cut--
sysprefs
Spaecewalk
--cut--
...
diff --git a/java/scripts/spelling/HOWTO b/java/scripts/spelling/HOWTO
new file mode 100644
index 0000000..8141023
--- /dev/null
+++ b/java/scripts/spelling/HOWTO
@@ -0,0 +1,29 @@
+TRANSLATION FILES SPELLING SCRIPT HOWTO
+
+Install required packages (Fedora):
+
+yum -y install aspell aspell-* libxslt translate-toolkit
+
+
+To check java resources:
+
+./check_java.sh en_US
+./check_java.sh en_US de [...]
+./check_java_ALL.sh
+
+
+To check gettext resources:
+
+./check_gettext.sh en_US
+./check_gettext.sh en_US de [...]
+./check_gettext_ALL.sh
+
+
+Ignore list:
+
+To add words to ignore list just append them to the end of the file and
+manually filter out typos. Its good idea to convert new words to lowercase
+but not all (CamelCase words should stay as is). You can easily convert
+to lowercase with vim (command 'gu').
+
+Make sure there is no blank line in the ignore file.
diff --git a/java/scripts/spelling/check_gettext.sh b/java/scripts/spelling/check_gettext.sh
new file mode 100755
index 0000000..5f8c4ba
--- /dev/null
+++ b/java/scripts/spelling/check_gettext.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+dirs=(
+backend/po
+client/rhel/rhnsd/po
+client/rhel/yum-rhn-plugin/po
+client/rhel/rhn-client-tools/po
+)
+
+if [ $# -lt 1 ]
+then
+ echo "Usage: `basename $0` {lang}"
+ exit 9
+fi
+
+for lang in "$@"
+do
+ for dir in "${dirs[@]}"
+ do
+ # po2txt does not go well with stdin mode (temp must be used)
+ tempfile=$(mktemp --suffix -spellcheck.po)
+ filename="../../$dir/$lang.po"
+ if [ -f "$filename" ]; then
+ echo "$(tput bold)$lang in $dir:$(tput sgr0) "
+ # remove untranslated strings (put a dummy space in it)
+ cat "$filename" | sed 's/^msgstr ""/msgstr " "/g' | sed -r 's/_//g' > "$tempfile"
+ po2txt --progress=none --nofuzzy "$tempfile" | \
+ aspell list -l $lang -p $(pwd)/ignored_$lang.txt --ignore=3 --encoding=utf-8 | \
+ sort -u
+ rm "$tempfile"
+ fi
+ done
+done
diff --git a/java/scripts/spelling/check_gettext_ALL.sh b/java/scripts/spelling/check_gettext_ALL.sh
new file mode 100755
index 0000000..64f2b94
--- /dev/null
+++ b/java/scripts/spelling/check_gettext_ALL.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# all langs in our po dirs
+langs=(
+ar
+as
+bg
+bn_IN
+bn
+ca
+cs
+cy
+da
+de
+el
+en_GB
+en
+es
+et
+fa
+fi
+fr
+gu
+he
+hi
+hr
+hu
+hy
+id
+is
+it_IT
+it
+ja
+ka
+kn
+ko
+ku
+lo
+lv
+mk
+ml
+mr
+ms
+my
+nb
+nl
+no
+or
+pa
+pl
+pt_BR
+pt
+ro
+ru
+si
+sk
+sl
+sq
+sr@Latn
+sr
+sv
+ta
+te
+tr
+uk
+ur
+vi
+zh_CN.GB2312
+zh_CN
+zh_TW.Big5
+zh_TW
+)
+
+for lang in "${langs[@]}"
+do
+ ./check_gettext.sh "$lang"
+done
diff --git a/java/scripts/spelling/check_gettext_en.sh b/java/scripts/spelling/check_gettext_en.sh
new file mode 100755
index 0000000..f2b0944
--- /dev/null
+++ b/java/scripts/spelling/check_gettext_en.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+./check_gettext.sh en en_GB
diff --git a/java/scripts/spelling/check_java.sh b/java/scripts/spelling/check_java.sh
new file mode 100755
index 0000000..6cba8b0
--- /dev/null
+++ b/java/scripts/spelling/check_java.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+dirs=(
+java/code/src/com/redhat/rhn/frontend/strings/database
+java/code/src/com/redhat/rhn/frontend/strings/java
+java/code/src/com/redhat/rhn/frontend/strings/jsp
+java/code/src/com/redhat/rhn/frontend/strings/nav
+java/code/src/com/redhat/rhn/frontend/strings/template
+)
+
+if [ $# -lt 2 ]
+then
+ echo "Usage: `basename $0` basedir {lang}"
+ echo "Example: `basename $0` . en_US de fr"
+ exit 9
+fi
+
+basedir=$1
+scriptdir=$(dirname "$0")
+logfile=$(mktemp)
+
+for lang in "${@:2}"
+do
+ for dir in "${dirs[@]}"
+ do
+ if [ "$lang" = "en_US" ]; then
+ xslt="$scriptdir/onlySource.xslt"
+ else
+ xslt="$scriptdir/onlyTarget.xslt"
+ fi
+ dirbase=$(basename "$dir")
+ filename="$basedir/$dir/StringResource_$lang.xml"
+ if [ -f "$filename" ]; then
+ echo "$(tput bold)$lang in $dir:$(tput sgr0) "
+ xsltproc "$xslt" "$filename" | \
+ aspell list -l $lang --home-dir="$scriptdir" \
+ -p "ignored_$lang.txt" --ignore=3 --encoding=utf-8 | \
+ sort -u | tee -a "$logfile"
+ fi
+ done
+done
+
+retcode=0
+if [ -s "$logfile" ]; then
+ echo "ERROR: There are spelling errors in resources, please fix or"
+ echo "add the following words in the scripts/spelling/ignore_en.txt:"
+ echo "--cut--"
+ cat "$logfile"
+ echo "--cut--"
+ retcode=1
+fi
+
+rm "$logfile";
+exit $retcode;
diff --git a/java/scripts/spelling/check_java_ALL.sh b/java/scripts/spelling/check_java_ALL.sh
new file mode 100755
index 0000000..279bb97
--- /dev/null
+++ b/java/scripts/spelling/check_java_ALL.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+langs=(
+en_US
+bn_IN
+de
+en_US
+es
+fr
+gu
+hi
+it
+ja
+ko
+pa
+pt_BR
+ru
+ta
+zh_CN
+zh_TW
+)
+
+for lang in "${langs[@]}"
+do
+ ./check_java.sh ../.. "$lang"
+done
diff --git a/java/scripts/spelling/check_java_en.sh b/java/scripts/spelling/check_java_en.sh
new file mode 100755
index 0000000..2e0ff38
--- /dev/null
+++ b/java/scripts/spelling/check_java_en.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+./check_java.sh ../.. en_US
diff --git a/java/scripts/spelling/ignored_en.txt b/java/scripts/spelling/ignored_en.txt
new file mode 120000
index 0000000..a356919
--- /dev/null
+++ b/java/scripts/spelling/ignored_en.txt
@@ -0,0 +1 @@
+ignored_en_US.txt
\ No newline at end of file
diff --git a/java/scripts/spelling/ignored_en_GB.txt b/java/scripts/spelling/ignored_en_GB.txt
new file mode 120000
index 0000000..a356919
--- /dev/null
+++ b/java/scripts/spelling/ignored_en_GB.txt
@@ -0,0 +1 @@
+ignored_en_US.txt
\ No newline at end of file
diff --git a/java/scripts/spelling/ignored_en_US.txt b/java/scripts/spelling/ignored_en_US.txt
new file mode 100644
index 0000000..f43254a
--- /dev/null
+++ b/java/scripts/spelling/ignored_en_US.txt
@@ -0,0 +1,279 @@
+personal_ws-1.1 en 0 utf-8
+ActionDetails
+AclHandler
+aclXXXX
+Bouvet
+Burkina
+Caicos
+catalina
+checkbox
+Checkin
+cleanindex
+config
+Config
+CPUs
+Debian
+Faroe
+Faso
+filename
+Futuna
+guestname
+Hong
+hostname
+Hostname
+http
+httpd
+https
+IllegalAccessException
+IllegalInvocationException
+initrd
+iSeries
+Javascript
+kickstart
+kickstarted
+kickstarting
+kickstarts
+kickstart's
+Kitts
+Lanka
+Leste
+login
+Login
+Logins
+LoginSubmit
+Lookup
+Macau
+Marino
+Mayen
+Mayotte
+mips
+Miquelon
+mtime
+Niue
+NVRE
+Palau
+Papua
+PowerPC
+pSeries
+Puerto
+redhat
+RHEL
+rhnsd
+sbin
+SearchServer
+SELinux
+solaris
+Solaris
+Sparc
+symlink
+symlinks
+taskomatic
+TASKOMATIC
+Timor
+Tokelau
+TRACEBACK
+Unentitle
+Unentitled
+Ungrouped
+Unhandled
+unsubscribe
+unsubscribed
+username
+Username
+vCPUs
+virsh
+virtualization
+Virtualization
+XMLRPC
+yyyy
+Zealand
+CompletedSystems
+FailedSystems
+GeneralConfig
+YourRhn
+Côte
+d'Ivoire
+Acknowledgement
+conf
+conns
+ExtendedStatus
+Filesystem
+FQDN
+ICMP
+IMAP
+Inodes
+iostat
+JDBC
+LongLegs
+Metres
+MySQL
+Pathname
+RCVD
+rdbms
+RHNMD
+RPMs
+Servlet
+SMTP
+SNMP
+Tablespace
+Uptime
+UserAgent
+Weblogic
+webserver
+ActivationKeysList
+adminstrators
+AllErrata
+apache
+auth
+Backend
+Backout
+bootloader
+Bootloader
+Bugfix
+Bugfixes
+cancelled
+checkboxes
+checkin
+Checksum
+chroot
+Comfirm
+commandline
+CommitErrataPackageChanges
+CompletedActions
+conf
+Configs
+Cpus
+CreateCorporate
+CreateProfileWizard
+critera
+Cron
+crypto
+cryptokey
+CryptoKeysList
+CVEs
+debuginfo
+DebugInfo
+deployable
+Deployable
+devsdc
+DHCP
+distro
+downloadable
+ELILO
+enablement
+Enablement
+esystem
+executables
+FailedActions
+FasTrack
+filepath
+filepaths
+filesystem
+GnuPG
+GPLv
+Greyed
+href
+html
+InProgressSystems
+ISOs
+kerberos
+Kerberos
+kickstartable
+Kickstartable
+KickstartPackagesEdit
+KickstartPartitionEdit
+KickstartSoftwareEdit
+Knowledgebase
+ksid
+LDAP
+listicon
+logout
+lookup
+myfilename
+nbsp
+Netboot
+newlogin
+nochroot
+nvrea
+patchset
+patchsets
+Patchsets
+plaintext
+Pluggable
+prepended
+PreservationList
+privledges
+privleges
+ProbeEdit
+ProbeList
+PurchaseHistory
+pxeboot
+Readme
+repo
+Repo
+repos
+Resubscription
+RHBA
+rhel
+rhncfg
+rpms
+RPMs
+searchable
+SElinux
+showgroups
+SNMP
+subscribable
+Subscribable
+SubscriptionManagement
+subtab
+SunOs
+SupportedISOs
+SystemChannels
+SystemEntitlements
+SystemList
+templating
+tftpboot
+Timestamp
+unchecking
+unentitled
+ungrouped
+uninstall
+unix
+Unschedule
+unselect
+unselectall
+updatelist
+uptime
+UserPreferences
+UUID
+VirtualGuestsList
+Virtualized
+vmlinuz
+VolGroup
+webcasts
+wget
+whitepapers
+wildcards
+xenbr
+Zipcode
+logins
+Entitler
+Isls
+prid
+selectall
+online
+Dialog
+hostname
+login
+username
+rhnregister
+Barthelemy
+ChildSubscriptions
+DeleteConfirm
+KickstartableSystems
+ListSystems
+PackageInstall
+PackageRemove
+PackageUpgrade
+PackageVerify
+sysprefs
diff --git a/java/scripts/spelling/onlySource.xslt b/java/scripts/spelling/onlySource.xslt
new file mode 100644
index 0000000..f1a9665
--- /dev/null
+++ b/java/scripts/spelling/onlySource.xslt
@@ -0,0 +1,16 @@
+<xsl:stylesheet version="1.0"
+ xmlns:x="urn:oasis:names:tc:xliff:document:1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+ <xsl:output method="text"/>
+
+ <xsl:template match="@*|node()">
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:template>
+
+ <xsl:template match="x:source">
+ <xsl:value-of select="text()"/>
+ <xsl:text> </xsl:text>
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/java/scripts/spelling/onlyTarget.xslt b/java/scripts/spelling/onlyTarget.xslt
new file mode 100644
index 0000000..2110eb0
--- /dev/null
+++ b/java/scripts/spelling/onlyTarget.xslt
@@ -0,0 +1,16 @@
+<xsl:stylesheet version="1.0"
+ xmlns:x="urn:oasis:names:tc:xliff:document:1.1"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+ <xsl:output method="text"/>
+
+ <xsl:template match="@*|node()">
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:template>
+
+ <xsl:template match="x:target">
+ <xsl:value-of select="text()"/>
+ <xsl:text> </xsl:text>
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 81944a4..16b4ba6 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -115,6 +115,8 @@ BuildRequires: stringtree-json
BuildRequires: struts
BuildRequires: sitemesh
BuildRequires: postgresql-jdbc
+# the following line is for spell checking script
+BuildRequires: aspell aspell-en libxslt
Obsoletes: rhn-java < 5.3.0
Obsoletes: rhn-java-sat < 5.3.0
Obsoletes: rhn-oracle-jdbc-tomcat5 <= 1.0
@@ -227,6 +229,10 @@ ant -Dprefix=$RPM_BUILD_ROOT install-tomcat6
install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/tomcat6/Catalina/localhost/
install -m 755 conf/rhn6.xml $RPM_BUILD_ROOT/%{_sysconfdir}/tomcat6/Catalina/localhost/rhn.xml
%endif
+
+# check spelling errors in all resources for English
+scripts/spelling/check_java.sh . en_US
+
install -d -m 755 $RPM_BUILD_ROOT/%{_initrddir}
install -d -m 755 $RPM_BUILD_ROOT/%{_bindir}
install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/rhn
@@ -261,7 +267,6 @@ install -d -m 755 $RPM_BUILD_ROOT/%{realcobsnippetsdir}
ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT/%{realcobsnippetsdir}/spacewalk
touch $RPM_BUILD_ROOT/%{_var}/spacewalk/systemlogs/audit-review.log
-
%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} < 13)
ln -s -f %{_javadir}/asm/asm.jar $RPM_BUILD_ROOT/%{_datadir}/rhn/lib/spacewalk-asm.jar
%else
@@ -269,7 +274,6 @@ ln -s -f %{_javadir}/objectweb-asm/asm.jar $RPM_BUILD_ROOT/%{_datadir}/rhn/lib/
%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/scripts/spelling/HOWTO b/scripts/spelling/HOWTO
deleted file mode 100644
index 8141023..0000000
--- a/scripts/spelling/HOWTO
+++ /dev/null
@@ -1,29 +0,0 @@
-TRANSLATION FILES SPELLING SCRIPT HOWTO
-
-Install required packages (Fedora):
-
-yum -y install aspell aspell-* libxslt translate-toolkit
-
-
-To check java resources:
-
-./check_java.sh en_US
-./check_java.sh en_US de [...]
-./check_java_ALL.sh
-
-
-To check gettext resources:
-
-./check_gettext.sh en_US
-./check_gettext.sh en_US de [...]
-./check_gettext_ALL.sh
-
-
-Ignore list:
-
-To add words to ignore list just append them to the end of the file and
-manually filter out typos. Its good idea to convert new words to lowercase
-but not all (CamelCase words should stay as is). You can easily convert
-to lowercase with vim (command 'gu').
-
-Make sure there is no blank line in the ignore file.
diff --git a/scripts/spelling/check_gettext.sh b/scripts/spelling/check_gettext.sh
deleted file mode 100755
index 5f8c4ba..0000000
--- a/scripts/spelling/check_gettext.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-dirs=(
-backend/po
-client/rhel/rhnsd/po
-client/rhel/yum-rhn-plugin/po
-client/rhel/rhn-client-tools/po
-)
-
-if [ $# -lt 1 ]
-then
- echo "Usage: `basename $0` {lang}"
- exit 9
-fi
-
-for lang in "$@"
-do
- for dir in "${dirs[@]}"
- do
- # po2txt does not go well with stdin mode (temp must be used)
- tempfile=$(mktemp --suffix -spellcheck.po)
- filename="../../$dir/$lang.po"
- if [ -f "$filename" ]; then
- echo "$(tput bold)$lang in $dir:$(tput sgr0) "
- # remove untranslated strings (put a dummy space in it)
- cat "$filename" | sed 's/^msgstr ""/msgstr " "/g' | sed -r 's/_//g' > "$tempfile"
- po2txt --progress=none --nofuzzy "$tempfile" | \
- aspell list -l $lang -p $(pwd)/ignored_$lang.txt --ignore=3 --encoding=utf-8 | \
- sort -u
- rm "$tempfile"
- fi
- done
-done
diff --git a/scripts/spelling/check_gettext_ALL.sh b/scripts/spelling/check_gettext_ALL.sh
deleted file mode 100755
index 64f2b94..0000000
--- a/scripts/spelling/check_gettext_ALL.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-# all langs in our po dirs
-langs=(
-ar
-as
-bg
-bn_IN
-bn
-ca
-cs
-cy
-da
-de
-el
-en_GB
-en
-es
-et
-fa
-fi
-fr
-gu
-he
-hi
-hr
-hu
-hy
-id
-is
-it_IT
-it
-ja
-ka
-kn
-ko
-ku
-lo
-lv
-mk
-ml
-mr
-ms
-my
-nb
-nl
-no
-or
-pa
-pl
-pt_BR
-pt
-ro
-ru
-si
-sk
-sl
-sq
-sr@Latn
-sr
-sv
-ta
-te
-tr
-uk
-ur
-vi
-zh_CN.GB2312
-zh_CN
-zh_TW.Big5
-zh_TW
-)
-
-for lang in "${langs[@]}"
-do
- ./check_gettext.sh "$lang"
-done
diff --git a/scripts/spelling/check_gettext_en.sh b/scripts/spelling/check_gettext_en.sh
deleted file mode 100755
index f2b0944..0000000
--- a/scripts/spelling/check_gettext_en.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-./check_gettext.sh en en_GB
diff --git a/scripts/spelling/check_java.sh b/scripts/spelling/check_java.sh
deleted file mode 100755
index ecf3fba..0000000
--- a/scripts/spelling/check_java.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-dirs=(
-java/code/src/com/redhat/rhn/frontend/strings/database
-java/code/src/com/redhat/rhn/frontend/strings/java
-java/code/src/com/redhat/rhn/frontend/strings/jsp
-java/code/src/com/redhat/rhn/frontend/strings/nav
-java/code/src/com/redhat/rhn/frontend/strings/template
-)
-
-if [ $# -lt 1 ]
-then
- echo "Usage: `basename $0` {lang}"
- exit 9
-fi
-
-for lang in "$@"
-do
- echo $lang
- for dir in "${dirs[@]}"
- do
- if [ "$lang" = "en_US" ]; then
- xslt=onlySource.xslt
- else
- xslt=onlyTarget.xslt
- fi
- dirbase=$(basename "$dir")
- filename="../../$dir/StringResource_$lang.xml"
- if [ -f "$filename" ]; then
- echo "$(tput bold)$lang in $dir:$(tput sgr0) "
- xsltproc $xslt ../../$dir/StringResource_$lang.xml | \
- aspell list -l $lang -p $(pwd)/ignored_$lang.txt --ignore=3 --encoding=utf-8 | \
- sort -u
- fi
- done
-done
diff --git a/scripts/spelling/check_java_ALL.sh b/scripts/spelling/check_java_ALL.sh
deleted file mode 100755
index 9b96ef3..0000000
--- a/scripts/spelling/check_java_ALL.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-langs=(
-en_US
-bn_IN
-de
-en_US
-es
-fr
-gu
-hi
-it
-ja
-ko
-pa
-pt_BR
-ru
-ta
-zh_CN
-zh_TW
-)
-
-for lang in "${langs[@]}"
-do
- ./check_java.sh "$lang"
-done
diff --git a/scripts/spelling/check_java_en.sh b/scripts/spelling/check_java_en.sh
deleted file mode 100755
index 85fadb5..0000000
--- a/scripts/spelling/check_java_en.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-./check_java.sh en_US
diff --git a/scripts/spelling/ignored_en.txt b/scripts/spelling/ignored_en.txt
deleted file mode 120000
index a356919..0000000
--- a/scripts/spelling/ignored_en.txt
+++ /dev/null
@@ -1 +0,0 @@
-ignored_en_US.txt
\ No newline at end of file
diff --git a/scripts/spelling/ignored_en_GB.txt b/scripts/spelling/ignored_en_GB.txt
deleted file mode 120000
index a356919..0000000
--- a/scripts/spelling/ignored_en_GB.txt
+++ /dev/null
@@ -1 +0,0 @@
-ignored_en_US.txt
\ No newline at end of file
diff --git a/scripts/spelling/ignored_en_US.txt b/scripts/spelling/ignored_en_US.txt
deleted file mode 100644
index f539770..0000000
--- a/scripts/spelling/ignored_en_US.txt
+++ /dev/null
@@ -1,270 +0,0 @@
-personal_ws-1.1 en 0 utf-8
-ActionDetails
-AclHandler
-aclXXXX
-Bouvet
-Burkina
-Caicos
-catalina
-checkbox
-Checkin
-cleanindex
-config
-Config
-CPUs
-Debian
-Faroe
-Faso
-filename
-Futuna
-guestname
-Hong
-hostname
-Hostname
-http
-httpd
-https
-IllegalAccessException
-IllegalInvocationException
-initrd
-iSeries
-Javascript
-kickstart
-Kickstart
-kickstarted
-kickstarting
-kickstarts
-kickstart's
-Kitts
-Lanka
-Leste
-login
-Login
-Logins
-LoginSubmit
-Lookup
-Macau
-Marino
-Mayen
-Mayotte
-mips
-Miquelon
-mtime
-Niue
-NVRE
-Palau
-Papua
-PowerPC
-pSeries
-Puerto
-redhat
-RHEL
-rhnsd
-sbin
-SearchServer
-SELinux
-solaris
-Solaris
-Sparc
-symlink
-symlinks
-taskomatic
-TASKOMATIC
-Timor
-Tokelau
-TRACEBACK
-Unentitle
-Unentitled
-Ungrouped
-Unhandled
-unsubscribe
-unsubscribed
-username
-Username
-vCPUs
-virsh
-virtualization
-Virtualization
-XMLRPC
-yyyy
-Zealand
-CompletedSystems
-FailedSystems
-GeneralConfig
-YourRhn
-Côte
-d'Ivoire
-Acknowledgement
-conf
-conns
-ExtendedStatus
-Filesystem
-FQDN
-ICMP
-IMAP
-Inodes
-iostat
-JDBC
-LongLegs
-Metres
-MySQL
-Pathname
-RCVD
-rdbms
-RHNMD
-RPMs
-Servlet
-SMTP
-SNMP
-Tablespace
-Uptime
-UserAgent
-Weblogic
-webserver
-ActivationKeysList
-adminstrators
-AllErrata
-apache
-auth
-Backend
-Backout
-bootloader
-Bootloader
-Bugfix
-Bugfixes
-cancelled
-checkboxes
-checkin
-Checksum
-chroot
-Comfirm
-commandline
-CommitErrataPackageChanges
-CompletedActions
-conf
-Configs
-Cpus
-CreateCorporate
-CreateProfileWizard
-critera
-Cron
-crypto
-cryptokey
-CryptoKeysList
-CVEs
-debuginfo
-DebugInfo
-deployable
-Deployable
-devsdc
-DHCP
-distro
-downloadable
-ELILO
-enablement
-Enablement
-esystem
-executables
-FailedActions
-FasTrack
-filepath
-filepaths
-filesystem
-GnuPG
-GPLv
-Greyed
-href
-html
-InProgressSystems
-ISOs
-kerberos
-Kerberos
-kickstartable
-Kickstartable
-KickstartPackagesEdit
-KickstartPartitionEdit
-KickstartSoftwareEdit
-Knowledgebase
-ksid
-LDAP
-listicon
-logout
-lookup
-myfilename
-nbsp
-Netboot
-newlogin
-nochroot
-nvrea
-patchset
-patchsets
-Patchsets
-plaintext
-Pluggable
-prepended
-PreservationList
-privledges
-privleges
-ProbeEdit
-ProbeList
-PurchaseHistory
-pxeboot
-Readme
-repo
-Repo
-repos
-Resubscription
-RHBA
-rhel
-rhncfg
-rpms
-RPMs
-searchable
-SElinux
-showgroups
-SNMP
-subscribable
-Subscribable
-SubscriptionManagement
-subtab
-SunOs
-SupportedISOs
-SystemChannels
-SystemEntitlements
-SystemList
-templating
-tftpboot
-Timestamp
-unchecking
-unentitled
-ungrouped
-uninstall
-unix
-Unschedule
-unselect
-unselectall
-updatelist
-uptime
-UserPreferences
-UUID
-VirtualGuestsList
-Virtualized
-vmlinuz
-VolGroup
-webcasts
-wget
-whitepapers
-wildcards
-xenbr
-Zipcode
-logins
-Entitler
-Isls
-prid
-selectall
-online
-Dialog
-hostname
-login
-username
-rhnregister
diff --git a/scripts/spelling/onlySource.xslt b/scripts/spelling/onlySource.xslt
deleted file mode 100644
index f1a9665..0000000
--- a/scripts/spelling/onlySource.xslt
+++ /dev/null
@@ -1,16 +0,0 @@
-<xsl:stylesheet version="1.0"
- xmlns:x="urn:oasis:names:tc:xliff:document:1.1"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
- <xsl:output method="text"/>
-
- <xsl:template match="@*|node()">
- <xsl:apply-templates select="@*|node()"/>
- </xsl:template>
-
- <xsl:template match="x:source">
- <xsl:value-of select="text()"/>
- <xsl:text> </xsl:text>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/scripts/spelling/onlyTarget.xslt b/scripts/spelling/onlyTarget.xslt
deleted file mode 100644
index 2110eb0..0000000
--- a/scripts/spelling/onlyTarget.xslt
+++ /dev/null
@@ -1,16 +0,0 @@
-<xsl:stylesheet version="1.0"
- xmlns:x="urn:oasis:names:tc:xliff:document:1.1"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
- <xsl:output method="text"/>
-
- <xsl:template match="@*|node()">
- <xsl:apply-templates select="@*|node()"/>
- </xsl:template>
-
- <xsl:template match="x:target">
- <xsl:value-of select="text()"/>
- <xsl:text> </xsl:text>
- </xsl:template>
-
-</xsl:stylesheet>
13 years, 6 months
Changes to 'refs/tags/spacewalk-utils-1.2.3-1'
by Tomas Lestach
Tag 'spacewalk-utils-1.2.3-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2010-10-05 09:44 +0000
Tagging package [spacewalk-utils] version [1.2.3-1] in directory [utils/].
Changes since spacewalk-java-1.2.49-1:
Lukas Zapletal (1):
postgres header comment cleanup
Tomas Lestach (2):
639818 - fixing sys path
Automatic commit of package [spacewalk-utils] release [1.2.3-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
schema/spacewalk/postgres/procs/delete_server.sql | 1 -
schema/spacewalk/postgres/procs/lookup_config_info.sql | 1 -
utils/migrate-system-profile | 4 ++++
utils/spacewalk-utils.spec | 5 ++++-
5 files changed, 9 insertions(+), 4 deletions(-)
---
13 years, 6 months
rel-eng/packages utils/spacewalk-utils.spec
by Tomas Lestach
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 232f61e3e9221f987f0a6b703a03349736544be9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 5 11:44:25 2010 +0200
Automatic commit of package [spacewalk-utils] release [1.2.3-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index e81606e..ddffb54 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.2.2-1 utils/
+1.2.3-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 331249c..47c6ed9 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.2.2
+Version: 1.2.3
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Oct 05 2010 Tomas Lestach <tlestach(a)redhat.com> 1.2.3-1
+- 639818 - fixing sys path (tlestach(a)redhat.com)
+
* Mon Oct 04 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.2-1
- replaced local copy of compile.py with standard compileall module
13 years, 6 months
utils/migrate-system-profile
by Tomas Lestach
utils/migrate-system-profile | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit e555355721833d7ad84d7742d9ce3baf5dfeaf06
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Oct 5 11:22:40 2010 +0200
639818 - fixing sys path
diff --git a/utils/migrate-system-profile b/utils/migrate-system-profile
index 9a7263e..77a4915 100755
--- a/utils/migrate-system-profile
+++ b/utils/migrate-system-profile
@@ -33,6 +33,10 @@ def systemExit(code, msgs=None):
sys.stderr.write(str(msg)+'\n')
sys.exit(code)
+_LIBPATH = "/usr/share/rhn"
+# add to the path if need be
+if _LIBPATH not in sys.path:
+ sys.path.append(_LIBPATH)
try:
import os
13 years, 6 months
schema/spacewalk
by Lukas Zapletal
schema/spacewalk/postgres/procs/delete_server.sql | 1 -
schema/spacewalk/postgres/procs/lookup_config_info.sql | 1 -
2 files changed, 2 deletions(-)
New commits:
commit 4a5122f3305f9f866fb7281a5f15743f2b4f6df4
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Tue Oct 5 11:13:26 2010 +0200
postgres header comment cleanup
diff --git a/schema/spacewalk/postgres/procs/delete_server.sql b/schema/spacewalk/postgres/procs/delete_server.sql
index bbec049..521c0ca 100644
--- a/schema/spacewalk/postgres/procs/delete_server.sql
+++ b/schema/spacewalk/postgres/procs/delete_server.sql
@@ -1,5 +1,4 @@
-- -- oracle equivalent source sha1 e16a211073e298ca515b54eb9c5eb51896463108
--- retrieved from ./1241139299/9d12c670ec75dda96634543d6082c6162eee0e97/schema/spacewalk/oracle/procs/delete_server.sql
-- one difference from Oracle (see TODO)
--
-- Copyright (c) 2008--2010 Red Hat, Inc.
diff --git a/schema/spacewalk/postgres/procs/lookup_config_info.sql b/schema/spacewalk/postgres/procs/lookup_config_info.sql
index 5a9ca46..23cfe13 100644
--- a/schema/spacewalk/postgres/procs/lookup_config_info.sql
+++ b/schema/spacewalk/postgres/procs/lookup_config_info.sql
@@ -1,5 +1,4 @@
-- oracle equivalent source sha1 a16dfd9a7caabf77b2070468ed52c815d9e466a9
--- retrieved from ./1249507968/a04b2169abc1974cee1a27cc15be4c4f9ba60dc1/schema/spacewalk/oracle/procs/lookup_config_info.sql
--
-- Copyright (c) 2008--2010 Red Hat, Inc.
--
13 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.2.49-1'
by Justin Sherrill
Tag 'spacewalk-java-1.2.49-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-10-04 16:05 +0000
Tagging package [spacewalk-java] version [1.2.49-1] in directory [java/].
Changes since spacewalk-monitoring-selinux-1.2.1-1:
Justin Sherrill (2):
639999 - removing management entitlement requirment from a bunch of user pages
Automatic commit of package [spacewalk-java] release [1.2.49-1].
Tomas Lestach (1):
639134 - use proper function when searching package using id
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 4 -
java/code/webapp/WEB-INF/struts-config.xml | 30 +++++-----
java/spacewalk-java.spec | 21 ++++++-
rel-eng/packages/spacewalk-java | 2
5 files changed, 38 insertions(+), 21 deletions(-)
---
13 years, 6 months
java/spacewalk-java.spec rel-eng/packages
by Justin Sherrill
java/spacewalk-java.spec | 21 ++++++++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 21 insertions(+), 2 deletions(-)
New commits:
commit 0865a1a5b5c8b35ac6a4979a9255fafa0724638f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Oct 4 12:05:33 2010 -0400
Automatic commit of package [spacewalk-java] release [1.2.49-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index a46cfa5..81944a4 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.48
+Version: 1.2.49
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -336,6 +336,25 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Oct 04 2010 Justin Sherrill <jsherril(a)redhat.com> 1.2.49-1
+- 639999 - removing management entitlement requirment from a bunch of user
+ pages (jsherril(a)redhat.com)
+- 639134 - use proper function when searching package using id
+ (tlestach(a)redhat.com)
+- Port /network/account/activation_keys/child_channels.pxt
+ (coec(a)war.coesta.com)
+- Create cache directory for both rpm and deb channels. (slukasik(a)redhat.com)
+- Use US spelling of 'organisation' (coec(a)war.coesta.com)
+- Port /network/systems/ssm/system_list.pxt (coec(a)war.coesta.com)
+- SSM System migration (coec(a)war.coesta.com)
+- distinguish spacewalk and satellite email body, when certificate expires
+ (tlestach(a)redhat.com)
+- Hardware Refresh - Create only one action (coec(a)war.coesta.com)
+- Package Refresh - Create only one action (coec(a)war.coesta.com)
+- Port SSM Package Refresh Page (coec(a)war.coesta.com)
+- Port /network/systems/ssm/index.pxt (colin.coe(a)gmail.com)
+- Implement schedule.archiveActions (coec(a)war.coesta.com)
+
* Thu Sep 30 2010 Lukas Zapletal 1.2.48-1
- jspf pages are now precompiled too
- deleted jpsf that was no longer in use
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index b5976da..9eea3d2 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.48-1 java/
+1.2.49-1 java/
13 years, 6 months
java/code
by Justin Sherrill
java/code/webapp/WEB-INF/struts-config.xml | 30 ++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 737dc043d14639dbda04c6cca890bbc8e2d74952
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Oct 4 12:03:37 2010 -0400
639999 - removing management entitlement requirment from a bunch of user pages
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index d4c7c16..5bd6c75 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -1200,7 +1200,7 @@
type="com.redhat.rhn.frontend.action.user.CreateUserSetupAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
- value="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ value="user_role(org_admin)"/>
<forward name="default" path="/WEB-INF/pages/user/create/usercreate.jsp" />
</action>
@@ -1311,7 +1311,7 @@
type="com.redhat.rhn.frontend.action.user.UserPrefSetupAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
- value="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ value="user_role(org_admin)"/>
<forward name="default" path="/WEB-INF/pages/admin/users/userpreferences.jsp" />
</action>
@@ -1322,7 +1322,7 @@
type="com.redhat.rhn.frontend.action.user.UserLocalePrefAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
- value="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ value="user_role(org_admin)"/>
<forward name="default" path="/WEB-INF/pages/admin/users/localepreferences.jsp" />
<forward name="display" path="/users/LocalePreferences.do" />
</action>
@@ -1352,7 +1352,7 @@
type="com.redhat.rhn.frontend.action.user.UserPrefAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
- value="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ value="user_role(org_admin)"/>
<forward name="success" path="/users/UserPreferences.do"
redirect="true" />
<forward name="failure" path="/users/UserPreferences.do" />
@@ -1377,7 +1377,7 @@
type="com.redhat.rhn.frontend.action.user.EditAddressSetupAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
- value="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ value="user_role(org_admin)"/>
<forward name="default" path="/WEB-INF/pages/admin/users/edit_address.jsp" />
</action>
@@ -1398,7 +1398,7 @@
type="com.redhat.rhn.frontend.action.user.EditAddressAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
- value="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ value="user_role(org_admin)"/>
<forward name="success" path="/users/Addresses.do"
redirect="true" />
<forward name="failure" path="/users/EditAddress.do" />
@@ -1422,7 +1422,7 @@
type="com.redhat.rhn.frontend.action.user.AssignedGroupsSetupAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
- value="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ value="user_role(org_admin)"/>
<forward name="default" path="/WEB-INF/pages/admin/assignedgroups.jsp" />
</action>
@@ -1433,7 +1433,7 @@
type="com.redhat.rhn.frontend.action.user.ChangeEmailSetupAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
- value="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ value="user_role(org_admin)"/>
<forward name="default" path="/WEB-INF/pages/admin/users/changeemail.jsp" />
</action>
@@ -1444,7 +1444,7 @@
type="com.redhat.rhn.frontend.action.user.ChangeEmailAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
- value="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ value="user_role(org_admin)"/>
<forward name="updated" path="/users/ChangeEmail.do" redirect="true" />
<forward name="failure" path="/users/ChangeEmail.do" />
</action>
@@ -1472,7 +1472,7 @@
type="com.redhat.rhn.frontend.action.user.AddressesAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
- value="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ value="user_role(org_admin)"/>
<forward name="default" path="/WEB-INF/pages/admin/users/useraddresses.jsp" />
</action>
@@ -1489,7 +1489,7 @@
type="com.redhat.rhn.frontend.action.user.UserListSetupAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
- value="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ value="user_role(org_admin)"/>
<forward name="default" path="/WEB-INF/pages/admin/users/userlist.jsp" />
</action>
@@ -1500,7 +1500,7 @@
className="com.redhat.rhn.frontend.struts.RhnActionMapping"
parameter="dispatch">
<set-property property="acls"
- value="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ value="user_role(org_admin)"/>
<forward name="default" path="/users/UserList.do" redirect="true" />
</action>
@@ -1671,7 +1671,7 @@
type="com.redhat.rhn.frontend.action.user.EnableUserSetupAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
- value="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ value="user_role(org_admin)"/>
<forward name="default" path="/WEB-INF/pages/admin/users/enableuser.jsp" />
</action>
@@ -1681,7 +1681,7 @@
type="com.redhat.rhn.frontend.action.user.EnableUserAction"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
- value="org_entitlement(sw_mgr_enterprise); user_role(org_admin)"/>
+ value="user_role(org_admin)"/>
<forward name="success" path="/users/ActiveList.do" redirect="true"/>
<forward name="failure" path="/users/UserDetails.do" redirect="false"/>
</action>
@@ -4742,7 +4742,7 @@
type="com.redhat.rhn.frontend.action.multiorg.SatRoleConfirm"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
- value="org_entitlement(sw_mgr_enterprise); user_role(satellite_admin)"/>
+ value="user_role(satellite_admin)"/>
<forward name="default" path="/WEB-INF/pages/admin/multiorg/deletesatadmin.jsp" />
<forward name="cancel" path="/admin/multiorg/Users.do" redirect="true" />
<forward name="logout" path="/Logout.do" redirect="true" />
13 years, 6 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit eb2b7e4a70634ffce8cbffcde62736101c14fe4e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Oct 4 17:57:46 2010 +0200
639134 - use proper function when searching package using id
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 3e5292f..ebaf880 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -355,7 +355,7 @@ ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
<mode name="systems_with_package" class="com.redhat.rhn.frontend.dto.SystemOverview">
<query params="org_id, pid, user_id">
-SELECT S.ID
+SELECT S.id, S.name
FROM rhnServerPackage SP, rhnPackage P, rhnServer S
WHERE S.org_id = :org_id
AND P.id = :pid
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 4e2c1b5..a19871f 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
@@ -4010,9 +4010,7 @@ public class SystemHandler extends BaseHandler {
if (pack == null) {
throw new InvalidPackageException(pid.toString());
}
- return SystemManager.listSystemsWithPackage(loggedInUser,
- pack.getPackageName().getName() , pack.getPackageEvr().getVersion(),
- pack.getPackageEvr().getRelease());
+ return SystemManager.listSystemsWithPackage(loggedInUser, pid.longValue());
}
/**
13 years, 6 months
Changes to 'refs/tags/spacewalk-monitoring-selinux-1.2.1-1'
by Jan Pazdziora
Tag 'spacewalk-monitoring-selinux-1.2.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-04 15:55 +0000
Tagging package [spacewalk-monitoring-selinux] version [1.2.1-1] in directory [selinux/spacewalk-monitoring-selinux/].
Changes since spacewalk-utils-1.2.2-1:
Colin Coe (3):
Port /network/account/activation_keys/child_channels.pxt
Remove commented code in SSMUpdateHardwareProfileConfirm.java
Fix checkstyle errors
Jan Pazdziora (2):
619014 - allow monitoring to read usr files as that's where some perl module now live.
Automatic commit of package [spacewalk-monitoring-selinux] release [1.2.1-1].
Lukas Zapletal (10):
old changelogs from Oracle sql script(s) removed
Oracle-Postgres schema synchronization
old changelogs from Oracle sql script(s) removed plus reformating where clause
Oracle-Postgres schema synchronization
Oracle-Postgres schema synchronization
old changelogs from Oracle sql script(s) removed
Oracle-Postgres schema synchronization
Oracle-Postgres schema synchronization
Oracle-Postgres schema synchronization
Oracle-Postgres schema synchronization
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 12
java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateHardwareProfileConfirm.java | 5
java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java | 150 ++++++++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 14
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 2
java/code/webapp/WEB-INF/nav/activation_key.xml | 2
java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp | 73 ++++
java/code/webapp/WEB-INF/struts-config.xml | 20 +
rel-eng/packages/spacewalk-monitoring-selinux | 2
schema/spacewalk/oracle/procs/delete_server.sql | 10
schema/spacewalk/oracle/procs/lookup_config_info.sql | 21 -
schema/spacewalk/oracle/triggers/rhnConfigRevision.sql | 15 -
schema/spacewalk/postgres/procs/delete_server.sql | 4
schema/spacewalk/postgres/procs/lookup_config_info.sql | 22 -
schema/spacewalk/postgres/triggers/rhnConfigRevision.sql | 6
schema/spacewalk/postgres/triggers/rhnKickstartableTree.sql | 39 +-
schema/spacewalk/postgres/triggers/rhnPackage.sql | 64 +++-
schema/spacewalk/postgres/triggers/web_user_personal_info.sql | 17 -
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 6
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring.te | 3
web/html/nav/activation_key.xml | 2
21 files changed, 391 insertions(+), 98 deletions(-)
---
13 years, 6 months