spacewalk-commits March 2012

spacewalk-commits@lists.fedorahosted.org

10 participants
371 discussions

java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 15 Mar '12

15 Mar '12

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 54f0fb950fa7b43c0f0988d69dba68be33cd1392 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Mar 15 19:24:04 2012 +0100 Automatic commit of package [spacewalk-java] release [1.8.16-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 1c0f75d..3b5f9f7 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -17,7 +17,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.15 +Version: 1.8.16 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -589,6 +589,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Mar 15 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.16-1 +- rewrite unittest.xml (tlestach(a)redhat.com) + * Thu Mar 15 2012 Stephen Herr <sherr(a)redhat.com> 1.8.15-1 - 790120 - Removing rule to help system overview listing happen faster, improving performance of api queries (sherr(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 2bec7e8..d4ca009 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.15-1 java/ +1.8.16-1 java/

1 0

java/scripts
by Tomas Lestach 15 Mar '12

15 Mar '12

java/scripts/unittest.xml | 90 ++++++++++++---------------------------------- 1 file changed, 24 insertions(+), 66 deletions(-) New commits: commit 5e27bb0ebc60b340e85ca1190175b4cacc1c83d3 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Mar 15 16:48:37 2012 +0100 rewrite unittest.xml diff --git a/java/scripts/unittest.xml b/java/scripts/unittest.xml index 0d63f49..dc9061c 100644 --- a/java/scripts/unittest.xml +++ b/java/scripts/unittest.xml @@ -1,86 +1,46 @@ - <project name="RHN" default="all" basedir="."> -<property name="reports.tests" location="/tmp/reports" /> -<property name="test-jar" location="/usr/share/rhn/lib/rhn-test.jar"/> + <property name="reports.tests" location="/tmp/reports" /> + <property name="test-jar" location="/usr/share/rhn/lib/rhn-test.jar"/> + <property name="tmpdir" value="${java.io.tmpdir}/spacewalk-test" /> -<property name="tmpdir" value="${java.io.tmpdir}/spacewalk-test" /> + <property name="tomcat" value="tomcat5" /> + <available file="/usr/share/java/tomcat6" type="dir" property="tomcat" value="tomcat6" /> + <echo message="Detected: ${tomcat}" /> + <target name="all" depends="test"/> -<condition property="tomcat5.exists"> - <available file="/var/lib/tomcat5/" type="dir" /> -</condition> -<condition property="tomcat6.exists"> - <available file="/var/lib/tomcat6/" type="dir" /> -</condition> + <target name="test"> - - -<target name="tomcat5-path" if="${tomcat5-exists}"> - <path id="class.path" > - <fileset dir="/var/lib/tomcat5/"> - <include name="webapps/rhn/WEB-INF/lib/*.jar" /> - </fileset> - - <fileset dir="/var/lib/tomcat5/"> - <include name="webapps/rhn/WEB-INF/lib/*.jar" /> - <include name="common/lib/*.jar" /> - <include name="server/lib/*.jar" /> - </fileset> - - <pathelement path="/var/lib/tomcat5/webapps/rhn"/> - <pathelement location="${test-jar}" /> - </path> -</target> - -<target name="tomcat6-path" if="${tomcat6-exists}"> - <path id="class.path" > - - <fileset dir="/var/lib/tomcat6/"> - <include name="webapps/rhn/WEB-INF/lib/*.jar" /> - </fileset> - - <fileset dir="/usr/share/tomcat6/"> - <include name="lib/*.jar" /> - </fileset> - - <pathelement path="/var/lib/tomcat6/webapps/rhn"/> - <pathelement location="${test-jar}" /> - </path> -</target> - - - -<target name="all" depends="test" /> - -<target name="test" > - - <antcall target="tomcat5-path" /> - <antcall target="tomcat6-path" /> + <condition property="testcase" value="Test"> + <not><isset property="testcase" /></not> + </condition> + <echo message="${testcase}" /> <delete dir="${reports.tests}" /> <mkdir dir="${reports.tests}"/> <mkdir dir="${tmpdir}"/> <unzip src="${test-jar}" dest="${tmpdir}" /> - <condition property="testcase" value="Test"> - <not><isset property="testcase" /></not> - </condition> - <echo message="${testcase}" /> - <junit forkmode="once" fork="yes" printsummary="yes" haltonfailure="no"> <jvmarg value="-Xdebug" /> <jvmarg value="-Xnoagent" /> <jvmarg value="-Djava.compiler=NONE" /> - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n" /> + <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8002,server=y,suspend=n" /> <classpath> - <path refid="class.path" /> + <pathelement location="${test-jar}" /> +  + <pathelement path="/var/lib/${tomcat}/webapps/rhn"/> + <fileset dir="/usr/share/${tomcat}"> + <include name="webapps/rhn/WEB-INF/lib/*.jar" /> + <include name="**/lib/*.jar" /> + </fileset> <path location="/usr/share/java/jmock.jar"/> <path location="/usr/share/java/jmock-cglib.jar"/> - <path location="/usr/share/java/mockobjects-core.jar"/> - <path location="/usr/share/java/struts-tiles.jar"/> + <path location="/usr/share/java/struts*.jar"/> </classpath> + <formatter type="plain"/> <batchtest fork="yes" todir="${reports.tests}"> @@ -88,11 +48,9 @@ <include name="**/*${testcase}.class"/> </fileset> </batchtest> - </junit> - <delete dir="${tmpdir}" /> - -</target> + <delete dir="${tmpdir}" /> + </target> </project>

1 0

Changes to 'refs/tags/spacewalk-java-1.8.15-1'
by StephenHerr 15 Mar '12

15 Mar '12

Tag 'spacewalk-java-1.8.15-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-03-15 17:22 +0000 Tagging package [spacewalk-java] version [1.8.15-1] in directory [java/]. Changes since spacewalk-java-1.8.14-1: Jan Pazdziora (1): Fixing typo (lookup.activatonkey.reason2 -> lookup.activationkey.reason2). Milan Zazrivec (2): fix quote_literal() syntax lookup_tag: schema upgrade Miroslav Suchý (1): Revert "removing unused string with trans-id 'lookup.activatonkey.reason2'" Simon Lukasik (1): Fix oracle syntax of analytical function Stephen Herr (2): 790120 - Removing rule to help system overview listing happen faster, improving performance of api queries Automatic commit of package [spacewalk-java] release [1.8.15-1]. --- java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 34 ++++++ java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 3 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 3 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 3 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 3 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 3 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 3 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 3 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 3 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 3 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 3 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 3 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 3 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 3 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 3 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 3 java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 20 --- java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 52 ++++++++++ java/spacewalk-java.spec | 11 +- rel-eng/packages/spacewalk-java | 2 schema/spacewalk/postgres/procs/lookup_tag.sql | 2 schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/015-lookup_tag.sql.oracle | 1 schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/015-lookup_tag.sql.postgresql | 34 ++++++ 25 files changed, 185 insertions(+), 21 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by StephenHerr 15 Mar '12

15 Mar '12

java/spacewalk-java.spec | 11 ++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) New commits: commit db07c59737fbac7557e2e0a5c907571876accf73 Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Mar 15 13:22:32 2012 -0400 Automatic commit of package [spacewalk-java] release [1.8.15-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index f7db939..1c0f75d 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -17,7 +17,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.14 +Version: 1.8.15 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -589,6 +589,15 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Mar 15 2012 Stephen Herr <sherr(a)redhat.com> 1.8.15-1 +- 790120 - Removing rule to help system overview listing happen faster, + improving performance of api queries (sherr(a)redhat.com) +- Fix oracle syntax of analytical function (slukasik(a)redhat.com) +- Fixing typo (lookup.activatonkey.reason2 -> lookup.activationkey.reason2). + (jpazdziora(a)redhat.com) +- Revert "removing unused string with trans-id 'lookup.activatonkey.reason2'" + (msuchy(a)redhat.com) + * Wed Mar 14 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.14-1 - fix LoginActionTest (tlestach(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 337e3a1..2bec7e8 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.14-1 java/ +1.8.15-1 java/

1 0

java/code
by StephenHerr 15 Mar '12

15 Mar '12

java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 34 ++++++ java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 20 --- java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 52 ++++++++++ 3 files changed, 89 insertions(+), 17 deletions(-) New commits: commit 60d188b797fd3bac125bc735ec88bf3fd33c2bd7 Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Mar 15 13:21:08 2012 -0400 790120 - Removing rule to help system overview listing happen faster, improving performance of api queries 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 abc68e8..cdb0cc5 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 @@ -425,6 +425,38 @@ ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id </query> </mode> +<mode name="xmlrpc_visible_to_user_inactive"> + <query params="user_id, checkin_threshold"> +select * from ( + SELECT DISTINCT S.id AS ID, + S.name AS NAME, + INFO.checkin AS LAST_CHECKIN + FROM rhnServer S, rhnUserServerPerms USP, rhnServerInfo INFO + WHERE USP.user_id = :user_id + AND S.id = USP.server_id + AND S.id = INFO.server_id + AND INFO.checkin < current_timestamp - numtodsinterval(:checkin_threshold * 86400, 'second') +) X +ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id + </query> +</mode> + +<mode name="xmlrpc_visible_to_user_active"> + <query params="user_id, checkin_threshold"> +select * from ( + SELECT DISTINCT S.id AS ID, + S.name AS NAME, + INFO.checkin AS LAST_CHECKIN + FROM rhnServer S, rhnUserServerPerms USP, rhnServerInfo INFO + WHERE USP.user_id = :user_id + AND S.id = USP.server_id + AND S.id = INFO.server_id + AND INFO.checkin > current_timestamp - numtodsinterval(:checkin_threshold * 86400, 'second') +) X +ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id + </query> +</mode> + <mode name="visible_to_user_from_sysid_list" class="com.redhat.rhn.frontend.dto.SystemSearchResult"> <query name="available_to_user_from_sysid_list" /> <elaborator name="system_overview" /> @@ -1112,7 +1144,7 @@ ORDER BY S.ID </query> <query name="system_overview" params=""> - SELECT /*+ RULE */ SERVER_ID AS ID, OUTDATED_PACKAGES, SERVER_NAME, security_errata, bug_errata, enhancement_errata, + SELECT SERVER_ID AS ID, OUTDATED_PACKAGES, SERVER_NAME, security_errata, bug_errata, enhancement_errata, SERVER_ADMINS, GROUP_COUNT, MODIFIED, CHANNEL_LABELS, CHANNEL_ID, HISTORY_COUNT, LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME, LAST_CHECKIN, LOCKED, config_files_with_differences, 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 3b76b07..e64ee9f 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 @@ -584,19 +584,9 @@ public class SystemHandler extends BaseHandler { * $SystemOverviewSerializer * #array_end() */ - public Object[] listActiveSystems(String sessionKey) throws FaultException { + public List listActiveSystems(String sessionKey) throws FaultException { User loggedInUser = getLoggedInUser(sessionKey); - DataResult<SystemOverview> dr = SystemManager.systemList(loggedInUser, null); - dr.elaborate(); - List<SystemOverview> returnList = new ArrayList(); - - for (SystemOverview so : dr) { - if (isSystemInactive(so)) { - continue; - } - returnList.add(so); - } - return returnList.toArray(); + return SystemManager.systemListShortActive(loggedInUser, null); } private Map createChannelMap(EssentialChannelDto channel, Boolean currentBase) { @@ -2340,7 +2330,6 @@ public class SystemHandler extends BaseHandler { return XmlRpcSystemHelper.getInstance().lookupServer(user, sid); } - /** * Private helper method to determine if a server is inactive. * @param so SystemOverview object representing system to inspect. @@ -4038,8 +4027,7 @@ public class SystemHandler extends BaseHandler { */ public List listInactiveSystems(String sessionKey) { User loggedInUser = getLoggedInUser(sessionKey); - return SystemManager.inactiveList(loggedInUser, null); - + return SystemManager.systemListShortInactive(loggedInUser, null); } @@ -4060,7 +4048,7 @@ public class SystemHandler extends BaseHandler { */ public List listInactiveSystems(String sessionKey, Integer days) { User loggedInUser = getLoggedInUser(sessionKey); - return SystemManager.inactiveList(loggedInUser, null, days); + return SystemManager.systemListShortInactive(loggedInUser, days, null); } /** diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java index be29dd0..db91a9a 100644 --- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java @@ -372,6 +372,58 @@ public class SystemManager extends BaseManager { } /** + * Returns list of all systems visible to user that are inactive. + * This is meant to be fast and only gets the id, name, and last checkin + * @param user Currently logged in user. + * @param pc PageControl + * @return list of SystemOverviews. + */ + public static DataResult systemListShortInactive(User user, PageControl pc) { + return systemListShortInactive(user, new Integer(Config.get().getInt(ConfigDefaults + .SYSTEM_CHECKIN_THRESHOLD)), pc); + } + + /** + * Returns list of all systems visible to user that are inactive. + * This is meant to be fast and only gets the id, name, and last checkin + * @param user Currently logged in user. + * @param inactiveThreshold number of days before we consider systems inactive + * @param pc PageControl + * @return list of SystemOverviews. + */ + public static DataResult systemListShortInactive( + User user, int inactiveThreshold, PageControl pc) { + SelectMode m = ModeFactory.getMode( + "System_queries", "xmlrpc_visible_to_user_inactive", + SystemOverview.class); + Map params = new HashMap(); + params.put("user_id", user.getId()); + params.put("checkin_threshold", inactiveThreshold); + Map elabParams = new HashMap(); + + return makeDataResult(params, elabParams, pc, m); + } + + /** + * Returns list of all systems visible to user that are active. + * This is meant to be fast and only gets the id, name, and last checkin + * @param user Currently logged in user. + * @param pc PageControl + * @return list of SystemOverviews. + */ + public static DataResult systemListShortActive(User user, PageControl pc) { + SelectMode m = ModeFactory.getMode( + "System_queries", "xmlrpc_visible_to_user_active", SystemOverview.class); + Map params = new HashMap(); + params.put("user_id", user.getId()); + params.put("checkin_threshold", new Integer(Config.get().getInt(ConfigDefaults + .SYSTEM_CHECKIN_THRESHOLD))); + Map elabParams = new HashMap(); + + return makeDataResult(params, elabParams, pc, m); + } + + /** * Returns list of all systems that are visible to user * but not in the given server group. * @param user Currently logged in user.

1 0

java/code
by Šimon Lukašík 15 Mar '12

15 Mar '12

java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8ec380d2745b347db1359aac9cc69d362c4a855e Author: Simon Lukasik <slukasik(a)redhat.com> Date: Thu Mar 15 14:22:02 2012 +0100 Fix oracle syntax of analytical function Addressing: com.redhat.rhn.common.db.WrappedSQLException: ORA-01747: invalid user.table.column, table.column, or column specification diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml index 608eb8f..6a2000f 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml @@ -14,7 +14,7 @@ <mode name="show_system_scans"> <query params="sid"> - SELECT tr.id, tr.identifier as test_result, rrt.label, count(rr.*), + SELECT tr.id, tr.identifier as test_result, rrt.label, count(*), TO_CHAR(sa.completion_time, 'YYYY-MM-DD HH24:MI:SS') AS completion_time FROM rhnXccdfTestresult tr, rhnXccdfRuleresult rr,

1 0

java/code
by Jan Pazdziora 15 Mar '12

15 Mar '12

java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 2 +- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) New commits: commit d63a7492b60e050b11db4b4688f3bc34c294d55c Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Mar 15 11:29:29 2012 +0100 Fixing typo (lookup.activatonkey.reason2 -> lookup.activationkey.reason2). diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml index 736b884..5d44845 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml @@ -328,7 +328,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>এই ব</target></trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> <target>এই অ্যাক্টিভেশন-কি দেখার অনুমতি আপনার নেই।</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index 9c351b2..921118c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -328,7 +328,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>Sie haben keine Berechtigung, diesen Benutzer einzusehen.</target></trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> <target>Sie haben keine Berechtigung, diesen Aktivierungsschl&uuml;ssel einzusehen.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> 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 aaca98f..e1b9307 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 @@ -336,7 +336,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> </trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> </trans-unit> <trans-unit id="lookup.servergroup.reason2"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index e140f71..e52c289 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -328,7 +328,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>No tiene permiso para ver este usuario.</target></trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> <target>No tiene permiso para ver esta llave de activación.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index e0896bd..cebe4d4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -328,7 +328,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>Vous n'avez pas la permission de visualiser cet utilisateur.</target></trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> <target>Vous n'avez pas la permission de visualiser cette clé d'activation.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml index 787ba54..f570c20 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml @@ -328,7 +328,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>તમારી પાસે આ વપરાશકર્તા જોવાની પરવાનગી નથી.</target></trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> <target>તમારી પાસે આ સક્રિયકરણ કી જોવાની પરવાનગી નથી.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml index d3dcd73..3e2816a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml @@ -328,7 +328,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>आपके पास उपयोक्ता देखने की अनुमति नहीं है.</target></trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> <target>आपके पास इस सक्रियकरण कंजी को देखने की अनुमति नहीं है.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index 18b9e27..16870f7 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -328,7 +328,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>Non vi è permesso visualizzare questo utente.</target></trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> <target>Non siete in possesso del permesso necessario per visualizzare questa chiave di attivazione.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index ebad4b3..dafdf9d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -328,7 +328,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>このユーザーを表示するパーミッションがありません。</target></trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> <target>このアクティベーションキーを表示するパーミッションがありません。</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index 0253a4f..24e9f06 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -328,7 +328,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>이 사용자 정보를 볼 수 있는 권한이 없습니다.</target></trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> <target>이 활성키를 볼 수 있는 권한이 없습니다. </target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml index 679c67c..ac222a8 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml @@ -328,7 +328,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>ਤੁਹਾਨੂੰ ਇਸ ਉਪਭੋਗੀ ਨੂੰ ਵੇਖਣ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।</target></trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> <target>ਤੁਹਾਨੂੰ ਇਸ ਸਰਗਰਮ ਕੁੰਜੀ ਨੂੰ ਵੇਖਣ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index d097801..e608fe7 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -328,7 +328,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>Você não tem permissão para visualizar este usuário.</target></trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> <target>Você não tem permissão para visualizar esta chave de ativação.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index f996aa0..a7b8a29 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -328,7 +328,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>У вас нет полномочий для просмотра этого пользователя.</target></trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> <target>У вас нет полномочий для просмотра этого ключа активации.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml index 8079346..b29aa16 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml @@ -328,7 +328,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>இந்தப் பயனரை பார்க்க உங்களுக்கு அனுமதி இல்லை.</target></trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> <target>இந்த செயல்படுத்தல் விசையைப் பார்க்க உங்களுக்கு அனுமதி இல்லை.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index 39d88a5..e258a4a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -328,7 +328,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>您没有查看这个用户的权限。</target></trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> <target>您没有查看这个激活码的权限。</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index c4434b4..e56349d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -328,7 +328,7 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>您沒有檢視這使用者的權限。</target></trans-unit> - <trans-unit id="lookup.activatonkey.reason2"> + <trans-unit id="lookup.activationkey.reason2"> <source>You do not have permission to view this activation key.</source> <target>您沒有檢視這啟動金鑰的權限。</target></trans-unit> <trans-unit id="lookup.servergroup.reason2">

1 0

java/code
by Miroslav Suchý 15 Mar '12

15 Mar '12

java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 3 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 3 +++ 16 files changed, 48 insertions(+) New commits: commit e81c3ced7e18de37a0598ef005d47047f1a49907 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Thu Mar 15 11:27:26 2012 +0100 Revert "removing unused string with trans-id 'lookup.activatonkey.reason2'" diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml index e2e53f2..736b884 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml @@ -328,6 +328,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>এই ব</target></trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + <target>এই অ্যাক্টিভেশন-কি দেখার অনুমতি আপনার নেই।</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> <target>এই সিস্টেম সংকলন দেখার অনুমতি আপনার নেই।</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index 79a0f39..9c351b2 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -328,6 +328,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>Sie haben keine Berechtigung, diesen Benutzer einzusehen.</target></trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + <target>Sie haben keine Berechtigung, diesen Aktivierungsschl&uuml;ssel einzusehen.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> <target>Sie haben keine Berechtigung, diese Systemgruppe einzusehen.</target></trans-unit> 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 1a2e783..aaca98f 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 @@ -336,6 +336,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> </trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + </trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> </trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index 9194d35..e140f71 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -328,6 +328,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>No tiene permiso para ver este usuario.</target></trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + <target>No tiene permiso para ver esta llave de activación.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> <target>No tiene permiso para ver este grupo de sistemas.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index cab2c55..e0896bd 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -328,6 +328,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>Vous n'avez pas la permission de visualiser cet utilisateur.</target></trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + <target>Vous n'avez pas la permission de visualiser cette clé d'activation.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> <target>Vous n'avez pas la permission de visualiser ce groupe de systèmes.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml index cd183fd..787ba54 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml @@ -328,6 +328,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>તમારી પાસે આ વપરાશકર્તા જોવાની પરવાનગી નથી.</target></trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + <target>તમારી પાસે આ સક્રિયકરણ કી જોવાની પરવાનગી નથી.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> <target>તમારી પાસે આ સિસ્ટમ જૂથ જોવાની પરવાનગી નથી.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml index 08fcd38..d3dcd73 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml @@ -328,6 +328,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>आपके पास उपयोक्ता देखने की अनुमति नहीं है.</target></trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + <target>आपके पास इस सक्रियकरण कंजी को देखने की अनुमति नहीं है.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> <target>आपके पास यह सिस्टम समूह देखने की अनुमति नहीं है.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index 872c55b..18b9e27 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -328,6 +328,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>Non vi è permesso visualizzare questo utente.</target></trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + <target>Non siete in possesso del permesso necessario per visualizzare questa chiave di attivazione.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> <target>Non siete in possesso del permesso necessario per visualizzare questo gruppo di sistemi.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index e89c9e8..ebad4b3 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -328,6 +328,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>このユーザーを表示するパーミッションがありません。</target></trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + <target>このアクティベーションキーを表示するパーミッションがありません。</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> <target>このシステムグループを表示するパーミッションがありません。</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index 733e6e1..0253a4f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -328,6 +328,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>이 사용자 정보를 볼 수 있는 권한이 없습니다.</target></trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + <target>이 활성키를 볼 수 있는 권한이 없습니다. </target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> <target>이 시스템 그룹을 볼 수 있는 권한이 없습니다. </target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml index 57229c8..679c67c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml @@ -328,6 +328,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>ਤੁਹਾਨੂੰ ਇਸ ਉਪਭੋਗੀ ਨੂੰ ਵੇਖਣ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।</target></trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + <target>ਤੁਹਾਨੂੰ ਇਸ ਸਰਗਰਮ ਕੁੰਜੀ ਨੂੰ ਵੇਖਣ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> <target>ਤੁਹਾਨੂੰ ਇਸ ਸਿਸਟਮ ਗਰੁੱਪ ਨੂੰ ਵੇਖਣ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ।</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index 7564ad0..d097801 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -328,6 +328,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>Você não tem permissão para visualizar este usuário.</target></trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + <target>Você não tem permissão para visualizar esta chave de ativação.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> <target>Você não tem permissão para visualizar este grupo de sistema.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index 97cab58..f996aa0 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -328,6 +328,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>У вас нет полномочий для просмотра этого пользователя.</target></trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + <target>У вас нет полномочий для просмотра этого ключа активации.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> <target>У вас нет полномочий для просмотра этой группы систем.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml index 86adafd..8079346 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml @@ -328,6 +328,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>இந்தப் பயனரை பார்க்க உங்களுக்கு அனுமதி இல்லை.</target></trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + <target>இந்த செயல்படுத்தல் விசையைப் பார்க்க உங்களுக்கு அனுமதி இல்லை.</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> <target>இந்த கணினி குழுவை பார்க்க உங்களுக்கு அனுமதி இல்லை.</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index f37a3a3..39d88a5 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -328,6 +328,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>您没有查看这个用户的权限。</target></trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + <target>您没有查看这个激活码的权限。</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> <target>您没有查看这个系统组群的权限。</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index 6cdea4d..c4434b4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -328,6 +328,9 @@ <trans-unit id="lookup.jsp.reason2.user"> <source>You do not have permission to view this user.</source> <target>您沒有檢視這使用者的權限。</target></trans-unit> + <trans-unit id="lookup.activatonkey.reason2"> + <source>You do not have permission to view this activation key.</source> + <target>您沒有檢視這啟動金鑰的權限。</target></trans-unit> <trans-unit id="lookup.servergroup.reason2"> <source>You do not have permission to view this system group.</source> <target>您沒有檢視這系統群組的權限。</target></trans-unit>

1 0

2 commits - schema/spacewalk
by Milan Zazrivec 15 Mar '12

15 Mar '12

schema/spacewalk/postgres/procs/lookup_tag.sql | 2 schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/015-lookup_tag.sql.oracle | 1 schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/015-lookup_tag.sql.postgresql | 34 ++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) New commits: commit b994690de241dc7a5a73212d47595a9e439dcc4b Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Thu Mar 15 10:04:42 2012 +0100 lookup_tag: schema upgrade diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/015-lookup_tag.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/015-lookup_tag.sql.oracle new file mode 100644 index 0000000..cf2393b --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/015-lookup_tag.sql.oracle @@ -0,0 +1 @@ +-- This file has intentionally been left empty. diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/015-lookup_tag.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/015-lookup_tag.sql.postgresql new file mode 100644 index 0000000..ae714b4 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/015-lookup_tag.sql.postgresql @@ -0,0 +1,34 @@ +-- oracle equivalent source sha1 b04dab2ff31049a8744e5ce1531ccd8b00152bbc + +create or replace function +lookup_tag(org_id_in in numeric, name_in in varchar) +returns numeric +as $$ +declare + tag_id numeric; +begin + select id + into tag_id + from rhnTag + where org_id = org_id_in and + name_id = lookup_tag_name(name_in); + + if not found then + tag_id := nextval('rhn_tag_id_seq'); + begin + perform pg_dblink_exec( + 'insert into rhnTag(id, org_id, name_id) values (' || + tag_id || ', ' || org_id_in || ', ' || + coalesce(quote_literal(lookup_tag_name(name_in)), 'NULL') || ')'); + exception when unique_violation then + select id + into strict tag_id + from rhnTag + where org_id = org_id_in and + name_id = lookup_tag_name(name_in); + end; + end if; + + return tag_id; +end; $$ +language plpgsql immutable; commit 5b0ecc46bd12c14a68ed8450f65d06b79a85e343 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Thu Mar 15 10:01:52 2012 +0100 fix quote_literal() syntax diff --git a/schema/spacewalk/postgres/procs/lookup_tag.sql b/schema/spacewalk/postgres/procs/lookup_tag.sql index c653402..935cf0b 100644 --- a/schema/spacewalk/postgres/procs/lookup_tag.sql +++ b/schema/spacewalk/postgres/procs/lookup_tag.sql @@ -32,7 +32,7 @@ begin perform pg_dblink_exec( 'insert into rhnTag(id, org_id, name_id) values (' || tag_id || ', ' || org_id_in || ', ' || - coalesce(quote_literal(lookup_tag_name(name_in), 'NULL')) || ')'); + coalesce(quote_literal(lookup_tag_name(name_in)), 'NULL') || ')'); exception when unique_violation then select id into strict tag_id

1 0

Changes to 'refs/tags/spacewalk-java-1.8.14-1'
by Tomas Lestach 14 Mar '12

14 Mar '12

Tag 'spacewalk-java-1.8.14-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-03-14 19:03 +0000 Tagging package [spacewalk-java] version [1.8.14-1] in directory [java/]. Changes since spacewalk-java-1.8.13-1: Tomas Lestach (2): fix LoginActionTest Automatic commit of package [spacewalk-java] release [1.8.14-1]. --- java/code/src/com/redhat/rhn/frontend/action/test/LoginActionTest.java | 2 +- java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits March 2012