java/code
by Jan Dobes
java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java | 79 ++--
java/code/src/com/redhat/rhn/common/db/datasource/test/UserData.java | 4
java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml | 181 +++++++++-
3 files changed, 220 insertions(+), 44 deletions(-)
New commits:
commit b42aac31f343e299d0886053659097bea6cff689
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue May 28 18:46:10 2013 +0200
making DataSourceParserTest work with PostgreSQL
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java
index e8dc1b2..ffb612b 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.common.db.datasource.test;
+import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.db.datasource.CachedStatement;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.db.datasource.MapColumnNotFoundException;
@@ -39,7 +40,18 @@ import java.util.Map;
public class DataSourceParserTest extends RhnBaseTestCase {
+ private String db_sufix;
+ private String db_user;
+
public DataSourceParserTest() {
+ if (ConfigDefaults.get().isOracle()) {
+ db_sufix = "_or";
+ db_user = "SPACEUSER";
+ }
+ else {
+ db_sufix = "_pg";
+ db_user = "spaceuser";
+ }
}
public void testGetModes() throws Exception {
@@ -69,7 +81,7 @@ public class DataSourceParserTest extends RhnBaseTestCase {
public void testExternalElaborator() throws Exception {
SelectMode m = ModeFactory.getMode("test_queries",
- "user_tables_external_elaborator");
+ "user_tables_external_elaborator" + db_sufix);
assertNotNull(m);
DataResult dr = m.execute(new HashMap());
@@ -81,27 +93,27 @@ public class DataSourceParserTest extends RhnBaseTestCase {
HashMap hm = (HashMap)i.next();
String name = (String)hm.get("username");
- if (name.equals("SYS")) {
+ if (name.toLowerCase().equals("spaceuser")) {
dr = dr.subList(pos, pos + 1);
}
pos++;
}
HashMap parameters = new HashMap();
- parameters.put("user_name", "SYS");
+ parameters.put("user_name", db_user);
dr.elaborate(parameters);
assertNotNull(dr);
i = dr.iterator();
while (i.hasNext()) {
Map hm = (Map)i.next();
- Map elab = (Map)hm.get("external_elaborator");
+ Map elab = (Map)hm.get("external_elaborator" + db_sufix);
assertTrue(((Long)elab.get("table_count")).intValue() > 0);
}
}
public void testRunQuery() throws Exception {
- SelectMode m = ModeFactory.getMode("test_queries", "user_tables");
+ SelectMode m = ModeFactory.getMode("test_queries", "user_tables" + db_sufix);
assertNotNull(m);
DataResult dr = m.execute(new HashMap());
@@ -113,21 +125,21 @@ public class DataSourceParserTest extends RhnBaseTestCase {
HashMap hm = (HashMap)i.next();
String name = (String)hm.get("username");
- if (name.equals("SYS")) {
+ if (name.toLowerCase().equals("spaceuser")) {
dr = dr.subList(pos, pos + 1);
}
pos++;
}
HashMap parameters = new HashMap();
- parameters.put("user_name", "SYS");
+ parameters.put("user_name", db_user);
dr.elaborate(parameters);
assertNotNull(dr);
i = dr.iterator();
while (i.hasNext()) {
Map hm = (Map)i.next();
- Map elab = (Map)hm.get("table_elaborator");
+ Map elab = (Map)hm.get("table_elaborator" + db_sufix);
assertTrue(((Long)elab.get("table_count")).intValue() > 0);
}
}
@@ -204,7 +216,12 @@ public class DataSourceParserTest extends RhnBaseTestCase {
Iterator j = elab.iterator();
while (j.hasNext()) {
Map curr = (Map)j.next();
- assertTrue(((Long)curr.get("column_id")).intValue() > 0);
+ if (ConfigDefaults.get().isOracle()) {
+ assertTrue(((Long)curr.get("column_id")).intValue() > 0);
+ }
+ else {
+ assertTrue(((Integer)curr.get("column_id")).intValue() > 0);
+ }
assertNotNull(curr.get("column_name"));
assertNotNull(curr.get("table_name"));
}
@@ -212,12 +229,12 @@ public class DataSourceParserTest extends RhnBaseTestCase {
}
public void testPercentS() throws Exception {
- runTestQuery("all_tables", "elaborator0");
+ runTestQuery("all_tables" + db_sufix, "elaborator0");
}
public void testBrokenDriving() throws Exception {
try {
- runTestQuery("broken_driving", "elaborator0");
+ runTestQuery("broken_driving" + db_sufix, "elaborator0");
fail("Should have thrown an exception");
}
catch (MapColumnNotFoundException e) {
@@ -228,7 +245,7 @@ public class DataSourceParserTest extends RhnBaseTestCase {
public void testBrokenElaborator() throws Exception {
try {
- runTestQuery("broken_elaborator", "elaborator0");
+ runTestQuery("broken_elaborator" + db_sufix, "elaborator0");
fail("Should have thrown an exception");
}
catch (MapColumnNotFoundException e) {
@@ -238,11 +255,11 @@ public class DataSourceParserTest extends RhnBaseTestCase {
}
public void testAlias() throws Exception {
- runTestQuery("all_tables_with_alias", "details");
+ runTestQuery("all_tables_with_alias" + db_sufix, "details" + db_sufix);
}
public void testExtraParams() throws Exception {
- SelectMode m = ModeFactory.getMode("test_queries", "all_tables");
+ SelectMode m = ModeFactory.getMode("test_queries", "all_tables" + db_sufix);
assertNotNull(m);
HashMap params = new HashMap();
@@ -252,18 +269,20 @@ public class DataSourceParserTest extends RhnBaseTestCase {
}
public void testDrivingParams() throws Exception {
- SelectMode m = ModeFactory.getMode("test_queries", "user_tables_for_user");
+ SelectMode m = ModeFactory.getMode("test_queries", "user_tables_for_user" +
+ db_sufix);
assertNotNull(m);
HashMap hm = new HashMap();
- hm.put("username", "SYS");
+ hm.put("username", db_user);
DataResult dr = m.execute(hm);
assertNotNull(dr);
assertTrue(dr.size() > 0);
}
public void testNullParam() throws Exception {
- SelectMode m = ModeFactory.getMode("test_queries", "user_tables_for_user");
+ SelectMode m = ModeFactory.getMode("test_queries", "user_tables_for_user" +
+ db_sufix);
assertNotNull(m);
try {
@@ -277,7 +296,8 @@ public class DataSourceParserTest extends RhnBaseTestCase {
}
public void testSort() throws Exception {
- SelectMode m = ModeFactory.getMode("test_queries", "all_tables_with_sort");
+ SelectMode m = ModeFactory.getMode("test_queries", "all_tables_with_sort" +
+ db_sufix);
assertNotNull(m);
DataResult dr = m.execute(new HashMap());
@@ -296,7 +316,8 @@ public class DataSourceParserTest extends RhnBaseTestCase {
}
public void testSortChangeOrder() throws Exception {
- SelectMode m = ModeFactory.getMode("test_queries", "all_tables_with_sort");
+ SelectMode m = ModeFactory.getMode("test_queries", "all_tables_with_sort" +
+ db_sufix);
assertNotNull(m);
DataResult dr = m.execute(new HashMap(), "table_name", "DESC");
@@ -315,7 +336,8 @@ public class DataSourceParserTest extends RhnBaseTestCase {
}
public void testSortColumn() throws Exception {
- SelectMode m = ModeFactory.getMode("test_queries", "all_tables_with_sort");
+ SelectMode m = ModeFactory.getMode("test_queries", "all_tables_with_sort" +
+ db_sufix);
assertNotNull(m);
DataResult dr = m.execute(new HashMap(), "owner", "DESC");
@@ -334,7 +356,8 @@ public class DataSourceParserTest extends RhnBaseTestCase {
}
public void testIllegalSortColumn() throws Exception {
- SelectMode m = ModeFactory.getMode("test_queries", "all_tables_with_sort");
+ SelectMode m = ModeFactory.getMode("test_queries", "all_tables_with_sort" +
+ db_sufix);
assertNotNull(m);
try {
@@ -355,13 +378,13 @@ public class DataSourceParserTest extends RhnBaseTestCase {
}
public void testSpecifiedClass() throws Exception {
- SelectMode m = ModeFactory.getMode("test_queries", "withClass");
+ SelectMode m = ModeFactory.getMode("test_queries", "withClass" + db_sufix);
String clazz = m.getClassString();
assertEquals("com.redhat.rhn.common.db.datasource.test.TableData", clazz);
}
public void testSpecifiedClassExecute() throws Exception {
- SelectMode m = ModeFactory.getMode("test_queries", "withClass");
+ SelectMode m = ModeFactory.getMode("test_queries", "withClass" + db_sufix);
String clazz = m.getClassString();
assertEquals("com.redhat.rhn.common.db.datasource.test.TableData", clazz);
DataResult dr = m.execute(new HashMap(), "owner", "DESC");
@@ -369,11 +392,11 @@ public class DataSourceParserTest extends RhnBaseTestCase {
assertTrue(dr.size() > 0);
Iterator i = dr.iterator();
TableData first = (TableData)i.next();
- assertTrue(first.getTableName().startsWith("RHN"));
+ assertTrue(first.getTableName().toLowerCase().startsWith("rhn"));
}
public void testClassElaborateList() throws Exception {
- SelectMode m = ModeFactory.getMode("test_queries", "withClass");
+ SelectMode m = ModeFactory.getMode("test_queries", "withClass" + db_sufix);
String clazz = m.getClassString();
assertEquals("com.redhat.rhn.common.db.datasource.test.TableData", clazz);
DataResult dr = m.execute(new HashMap(), "owner", "DESC");
@@ -384,17 +407,17 @@ public class DataSourceParserTest extends RhnBaseTestCase {
Iterator i = dr.iterator();
TableData first = (TableData)i.next();
- assertTrue(first.getTableName().startsWith("RHN"));
+ assertTrue(first.getTableName().toLowerCase().startsWith("rhn"));
assertTrue(first.getColumnName().size() > 0);
assertTrue(first.getColumnId().size() > 0);
}
public void testSpecifiedClassElaborate() throws Exception {
- SelectMode m = ModeFactory.getMode("test_queries", "user_class");
+ SelectMode m = ModeFactory.getMode("test_queries", "user_class" + db_sufix);
String clazz = m.getClassString();
assertEquals("com.redhat.rhn.common.db.datasource.test.UserData", clazz);
HashMap hm = new HashMap();
- hm.put("username", "SYS");
+ hm.put("username", db_user);
DataResult dr = m.execute(hm);
assertNotNull(dr);
assertTrue(dr.size() > 0);
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/UserData.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/UserData.java
index e3690cc..9e06f03 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/test/UserData.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/UserData.java
@@ -26,6 +26,10 @@ public class UserData {
userId = ci;
}
+ public void setUserId(Integer ci) {
+ setUserId(new Long(ci));
+ }
+
public void setTableCount(Long ci) {
tableCount = ci;
}
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
index 8cc5815..6b0e3e4 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml
@@ -1,11 +1,11 @@
<datasource_modes>
-<mode name="user_tables_for_user">
+<mode name="user_tables_for_user_or">
<query params="username">
SELECT u.username as USERNAME, u.user_id as USER_ID, u.created as CREATED
FROM all_users u
WHERE u.username=:username
</query>
- <elaborator name="table_elaborator" column="username" params="user_name">
+ <elaborator name="table_elaborator_or" column="username" params="user_name">
SELECT c.owner as USERNAME, COUNT(c.table_name) as TABLE_COUNT
FROM all_catalog c
WHERE owner=:user_name
@@ -14,12 +14,26 @@
</elaborator>
</mode>
-<mode name="user_tables">
+<mode name="user_tables_for_user_pg">
+ <query params="username">
+ SELECT u.usename as USERNAME, u.usesysid as USER_ID
+ FROM pg_user u
+ WHERE u.usename=:username
+ </query>
+ <elaborator name="table_elaborator_pg" column="username" params="user_name">
+ SELECT c.tableowner as USERNAME, COUNT(c.tablename) as TABLE_COUNT
+ FROM pg_tables c
+ WHERE tableowner=:user_name
+ GROUP BY tableowner
+ </elaborator>
+</mode>
+
+<mode name="user_tables_or">
<query params="">
SELECT u.username as USERNAME, u.user_id as USER_ID, u.created as CREATED
FROM all_users u
</query>
- <elaborator name="table_elaborator" column="username" params="user_name">
+ <elaborator name="table_elaborator_or" column="username" params="user_name">
SELECT c.owner as USERNAME, COUNT(c.table_name) as TABLE_COUNT
FROM all_catalog c
WHERE owner=:user_name
@@ -29,7 +43,21 @@
</elaborator>
</mode>
-<mode name="all_tables">
+<mode name="user_tables_pg">
+ <query params="">
+ SELECT u.usename as USERNAME, u.usesysid as USER_ID
+ FROM pg_user u
+ </query>
+ <elaborator name="table_elaborator_pg" column="username" params="user_name">
+ SELECT c.tableowner as USERNAME, COUNT(c.tablename) as TABLE_COUNT
+ FROM pg_tables c
+ WHERE tableowner=:user_name
+ AND tableowner IN (%s)
+ GROUP BY tableowner
+ </elaborator>
+</mode>
+
+<mode name="all_tables_or">
<query params="">
SELECT t.table_name
FROM all_tables t
@@ -43,9 +71,24 @@
</elaborator>
</mode>
+<mode name="all_tables_pg">
+ <query params="">
+ SELECT t.tablename as table_name
+ FROM pg_tables t
+ WHERE t.tablename LIKE 'rhn%'
+ ORDER BY t.tablename
+ </query>
+ <elaborator params="" column="table_name" multiple="t">
+ SELECT c.relname as TABLE_NAME, a.attname as COLUMN_NAME, a.atttypid as COLUMN_ID
+ FROM pg_attribute a, pg_class c
+ WHERE c.relname in (%s)
+ AND c.oid = a.attrelid
+ </elaborator>
+</mode>
+
<!-- This query is broken, because the ID column doesn't exist in the
driving query, but that is what should be used to map the two results -->
-<mode name="broken_driving">
+<mode name="broken_driving_or">
<query params="">
SELECT t.table_name
FROM all_tables t
@@ -59,9 +102,23 @@
</elaborator>
</mode>
+<mode name="broken_driving_pg">
+ <query params="">
+ SELECT t.tablename
+ FROM pg_tables t
+ WHERE t.tablename LIKE 'rhn%'
+ ORDER BY tablename
+ </query>
+ <elaborator params="" multiple="t">
+ SELECT attrelid, attrelid ID, attname, atttypid
+ FROM pg_attribute
+ WHERE attname in (%s)
+ </elaborator>
+</mode>
+
<!-- This query is broken, because the ID column doesn't exist in the
elaborator, but that is what should be used to map the two results -->
-<mode name="broken_elaborator">
+<mode name="broken_elaborator_or">
<query params="">
SELECT t.table_name, t.table_name ID
FROM all_tables t
@@ -75,23 +132,53 @@
</elaborator>
</mode>
+<mode name="broken_elaborator_pg">
+ <query params="">
+ SELECT t.tablename, t.tablename ID
+ FROM pg_tables t
+ WHERE t.tablename LIKE 'rhn%'
+ ORDER BY tablename
+ </query>
+ <elaborator params="" multiple="t">
+ SELECT attrelid, attname, atttypid
+ FROM pg_attribute
+ WHERE attname in (%s)
+ </elaborator>
+</mode>
+
+
<!-- Keep the columns named ID here, because it provides an easy way to test
that the default column of ID still works. -->
-<mode name="all_tables_with_alias">
+<mode name="all_tables_with_alias_or">
<query params="">
SELECT t.table_name, t.table_name ID
FROM all_tables t
WHERE t.table_name LIKE 'RHN%'
ORDER BY table_name
</query>
- <elaborator params="" multiple="t" alias="details">
+ <elaborator params="" multiple="t" alias="details_or">
SELECT table_name, table_name ID, column_name, column_id
FROM all_tab_cols
WHERE table_name in (%s)
</elaborator>
</mode>
-<mode name="all_tables_with_sort">
+<mode name="all_tables_with_alias_pg">
+ <query params="">
+ SELECT t.tablename as table_name, t.tablename ID
+ FROM pg_tables t
+ WHERE t.tablename LIKE 'rhn%'
+ ORDER BY t.tablename
+ </query>
+ <elaborator params="" multiple="t" alias="details_pg">
+ SELECT c.relname as TABLE_NAME, c.relname ID, a.attname as COLUMN_NAME, a.atttypid as COLUMN_ID
+ FROM pg_attribute a, pg_class c
+ WHERE c.relname in (%s)
+ AND c.oid = a.attrelid
+ </elaborator>
+</mode>
+
+<mode name="all_tables_with_sort_or">
<query params="" sort="table_name,owner" defaultsort="table_name"
sortorder="asc">
SELECT t.table_name, t.owner
@@ -106,6 +193,22 @@
</elaborator>
</mode>
+<mode name="all_tables_with_sort_pg">
+ <query params="" sort="table_name,owner" defaultsort="table_name"
+ sortorder="asc">
+ SELECT t.tablename as table_name, t.tableowner as owner
+ FROM pg_tables t
+ WHERE t.tablename LIKE 'rhn%'
+ ORDER BY %o
+ </query>
+ <elaborator params="" column="table_name" multiple="t">
+ SELECT c.relname as TABLE_NAME, a.attname, a.atttypid
+ FROM pg_attribute a, pg_class c
+ WHERE c.relname in (%s)
+ AND c.oid = a.attrelid
+ </elaborator>
+</mode>
+
<write-mode name="update_group_type">
<query params="type_id, sgid">
@@ -185,7 +288,7 @@ SELECT u.created as CREATED
<!-- Test to benchmark datasource vs hibernate -->
-<mode name="withClass" class="com.redhat.rhn.common.db.datasource.test.TableData">
+<mode name="withClass_or" class="com.redhat.rhn.common.db.datasource.test.TableData">
<query params="">
SELECT t.table_name
FROM all_tables t
@@ -199,13 +302,29 @@ SELECT u.created as CREATED
</elaborator>
</mode>
-<mode name="user_class" class="com.redhat.rhn.common.db.datasource.test.UserData">
+<mode name="withClass_pg" class="com.redhat.rhn.common.db.datasource.test.TableData">
+ <query params="">
+ SELECT t.tablename as table_name
+ FROM pg_tables t
+ WHERE t.tablename LIKE 'rhn%'
+ ORDER BY t.tablename
+ </query>
+ <elaborator params="" column="table_name" multiple="t">
+ SELECT c.relname as TABLE_NAME, a.attname as COLUMN_NAME, a.atttypid as COLUMN_ID
+ FROM pg_attribute a, pg_class c
+ WHERE c.relname in (%s)
+ AND c.oid = a.attrelid
+ </elaborator>
+</mode>
+
+
+<mode name="user_class_or" class="com.redhat.rhn.common.db.datasource.test.UserData">
<query params="username">
SELECT u.username as USERNAME, u.user_id as USER_ID, u.created as CREATED
FROM all_users u
WHERE u.username=:username
</query>
- <elaborator name="table_elaborator" column="username" params="username">
+ <elaborator name="table_elaborator_or" column="username" params="username">
SELECT c.owner as USERNAME, COUNT(c.table_name) as TABLE_COUNT
FROM all_catalog c
WHERE owner=:username
@@ -214,15 +333,29 @@ SELECT u.created as CREATED
</elaborator>
</mode>
-<mode name="user_tables_external_elaborator">
+<mode name="user_class_pg" class="com.redhat.rhn.common.db.datasource.test.UserData">
+ <query params="username">
+ SELECT u.usename as USERNAME, u.usesysid as USER_ID
+ FROM pg_user u
+ WHERE u.usename=:username
+ </query>
+ <elaborator name="table_elaborator_pg" column="username" params="username">
+ SELECT c.tableowner as USERNAME, COUNT(c.tablename) as TABLE_COUNT
+ FROM pg_tables c
+ WHERE tableowner=:username
+ GROUP BY tableowner
+ </elaborator>
+</mode>
+
+<mode name="user_tables_external_elaborator_or">
<query params="">
SELECT u.username as USERNAME, u.user_id as USER_ID, u.created as CREATED
FROM all_users u
</query>
- <elaborator name="external_elaborator" params="user_name" />
+ <elaborator name="external_elaborator_or" params="user_name" />
</mode>
-<query name="external_elaborator" column="username" params="user_name">
+<query name="external_elaborator_or" column="username" params="user_name">
SELECT c.owner as USERNAME, COUNT(c.table_name) as TABLE_COUNT
FROM all_catalog c
WHERE owner=:user_name
@@ -230,6 +363,22 @@ SELECT u.created as CREATED
GROUP BY owner
</query>
+<mode name="user_tables_external_elaborator_pg">
+ <query params="">
+ SELECT u.usename as USERNAME, u.usesysid as USER_ID
+ FROM pg_user u
+ </query>
+ <elaborator name="external_elaborator_pg" params="user_name" />
+</mode>
+
+<query name="external_elaborator_pg" column="username" params="user_name">
+ SELECT c.tableowner as USERNAME, COUNT(c.tablename) as TABLE_COUNT
+ FROM pg_tables c
+ WHERE tableowner=:user_name
+ GROUP BY tableowner
+</query>
+
+
<write-mode name="insert_into_rhnServerPath">
<query params="server_id, proxy_server_id, proxy_hostname, position">
INSERT INTO rhnServerPath(SERVER_ID, PROXY_SERVER_ID, HOSTNAME, POSITION)
10 years, 10 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d03fdfc2534281665efaa2caacb18c04a86b935e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 29 13:25:34 2013 +0200
516265 - sort parent channel pop-up menu by channel name
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index 0169548..8bcee7d 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -293,7 +293,8 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
AND uc.org_id = :org_id
AND uc.user_id = :user_id
AND uc.role = 'subscribe'
- AND c.parent_channel is null]]>
+ AND c.parent_channel is null
+ ORDER BY c.name]]>
<return alias="c" class="com.redhat.rhn.domain.channel.Channel" />
</sql-query>
10 years, 10 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java | 11 ------
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 ---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 7 ---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 7 ---
java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp | 18 ----------
34 files changed, 251 deletions(-)
New commits:
commit bd92f3bdf04595984f4bb369caf77fd99e204b49
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 29 12:24:19 2013 +0200
514288 - removing obsolete kickstart warning
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java
index 5f9153f..c66e5a0 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java
@@ -125,17 +125,6 @@ public class SessionStatusAction extends RhnAction {
request.setAttribute("scrollX", xPos);
request.setAttribute("scrollY", yPos);
}
- // Check for downgrading base channel, example RHEL5 to RHEL4
- request.setAttribute("kswarning", null);
- if (kss.getHostServer() != null) {
- if ((kss.getHostServer().getBaseChannel().compareTo(
- kss.getKstree().getChannel()) < 0)) {
- String warning = LocalizationService.getInstance().getMessage(
- "kickstart.schedule.requires.older.gpgkey",
- kss.getHostServer().getName());
- request.setAttribute("kswarning", warning);
- }
- }
SdcHelper.ssmCheck(ctx.getRequest(), s.getId(), currentUser);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
index 18ea945..5353efa 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml
@@ -6361,13 +6361,6 @@ Follow this url to see the full list of inactive systems:
</context-group>
<target>ব্যবহারকারীর দ্বারা Kickstart বাতিল করা হয়েছে: {0}</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- <target>Red Hat Enterprise Linux-র একটি পুরোনো সংস্করণে System {0} kickstart করার জন্য নির্ধারিত হয়। এর জন্য সংশ্লিষ্ট পুরোনো রিলিজের GPG-কি প্রয়োগ করা আবশ্যক। <br/> অনুগ্রহ করে এই কি ইনস্টল করুন: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </target>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
index fde9b21..66e6a60 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
@@ -7017,13 +7017,6 @@ Folgen Sie dieser URL für die vollständige Liste inaktiver Systeme:
</context-group>
<target>Kickstart wurde von Benutzer {0} abgebrochen.</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- <target>System {0} ist eingeplant für einen Kickstart auf eine ältere Version von Red Hat Enterprise Linux; es wird den GPG-Schlüssel für die ältere Release benötigen. <br/> Bitte installieren Sie diesen Schlüssel, z. B.: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </target>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index d819e69..508f225 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -5682,12 +5682,6 @@ Follow this url to see the full list of inactive systems:
<context context-type="sourcefile">/rhn/kickstart/KickstartSessionCancel.do</context>
</context-group>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
index d3deb3d..385f232 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
@@ -7017,13 +7017,6 @@ Vaya a esta dirección para ver la lista completa de sistemas inactivos:
</context-group>
<target>Kickstart cancelado por el usuario: {0}</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- <target>El sistema {0} está programado para ser instalado con kickstart a una versión menos reciente de Red Hat Enterprise Linux, se requerirá la llave GPG para el lanzamiento antiguo. <br/> Por favor instale esta llave, por ejemplo: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </target>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
index cb80613..b358987 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
@@ -7018,13 +7018,6 @@ Suivez cet url pour obtenir la liste complète des systèmes inactifs :
</context-group>
<target>Kickstart annulé par l'utilisateur : {0}</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- <target>Système {0} est programmé pour être "kickstarté" vers une ancienne version de Red Hat Enterprise Linux, une clé GPH sera requise pour celle-ci. <br/> Veuillez installer installer cette clé, exemple : rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </target>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
index 86e14f5..1d935a5 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml
@@ -6354,13 +6354,6 @@ Follow this url to see the full list of inactive systems:
</context-group>
<target>વપરાશકર્તા દ્વારા રદ કરી દેવાયેલ કિકસ્ટાર્ટ: {0}</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- <target>સિસ્ટમ {0} એ Red Hat Enterprise Linux ની જૂની આવૃત્તિમાં કિકસ્ટાર્ટ થવા માટે ગોઠવેલ છે, તે જૂનાં પ્રકાશન માટે GPG કી ની જરૂર પડશે. <br/> મહેરબાની કરીને આ કીને સ્થાપિત કરો, ઉદાહરણ : <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong></target>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
index 19dcf11..cd9b3b2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml
@@ -6354,13 +6354,6 @@ Follow this url to see the full list of inactive systems:
</context-group>
<target>उपयोक्ता द्वारा रद्द किया गया किकस्टार्ट: {0}</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- <target>सिस्टम {0} को Red Hat Enterprise Linux के पुराने संस्करण में किकस्टार्ट किए जाने के लिए नियोजित किया गया है, इसके पुराने रिलीज के लिए GPG कुंजी की जरूरत होगी. <br/> इस कुंजी को अधिष्ठापित करें, उदाहरण: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </target>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
index 51c874e..2e79b09 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
@@ -7016,13 +7016,6 @@ Seguite l'url sotto riportato per visualizzare l'elenco completo di sistemi inat
</context-group>
<target>Kickstart cancellato dall'utente: {0}</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- <target>Il sistema {0} è stato programmato per un kickstart ad una versione più vecchia di Red Hat Enterprise Linux, per questo sarà necessaria la chiave GPG per la release più vecchia. <br/>Si prega di installare questa chiave, esempio: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </target>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
index 8c5eb6a..3cdddd6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
@@ -7015,13 +7015,6 @@ Follow this url to see the full list of inactive systems:
</context-group>
<target>キックスタートが次のユーザーにより取り消されました: {0}</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- <target>システム {0} が古いバージョンの Red Hat Enterprise Linux にキックスタートされるようスケジュールされているため、古いリリースの GPG キーが必要です。 <br/> <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> などで、キーをインストールしてください。</target>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
index e8379a7..a6b9a9d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
@@ -7017,13 +7017,6 @@ Follow this url to see the full list of inactive systems:
</context-group>
<target>킥스타트 다음 사용자에 의해 취소되었습니다: {0}</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- <target>시스템 (0)가 이전 Red HatEnterprise Linux 버전에 킥스타트되도록 스케줄되어 있기 때문에 이전 버전의 GPG 키가 필요합니다. <br/> <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> 등으로 키를 설치하십시오. </target>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
index bd31267..b1b6f7d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml
@@ -6356,13 +6356,6 @@ Follow this url to see the full list of inactive systems:
</context-group>
<target>ਕਿੱਕਸਟਾਰਟ ਉਪਭੋਗੀ ਦੁਆਰਾ ਰੱਦ ਕੀਤੀ ਗਈ: {0}</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- <target>ਸਿਸਟਮ {0} ਨੂੰ Red Hat Enterprise Linux ਦੇ ਪੁਰਾਣੇ ਵਰਜਨ ਨਾਲ ਕਿੱਕਸਟਾਰਟ ਕਰਨ ਲਈ ਸਮਾਂ-ਤਹਿ ਕੀਤਾ ਗਿਆ ਹੈ, ਇਸ ਲਈ ਪੁਰਾਣੇ ਰੀਲੀਜ਼ ਦੀ GPG ਕੁੰਜੀ ਦੀ ਲੇੜ ਪਵੇਗੀ। <br/> ਕਿਰਪਾ ਕਰਕੇ ਇਹ ਕੁੰਜੀ ਇੰਸਟਾਲ ਕਰੋ, ਉਦਾਹਰਨ: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </target>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
index 06cc76a..141a2d6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
@@ -7003,13 +7003,6 @@ Follow this url to see the full list of inactive systems:
</context-group>
<target>Kickstart cancelado pelo usuário: {0}</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- <target>O Sistema {0}está agendado para iniciar o kickstart em uma versão mais antiga do Red Hat Enterprise Linux, ele irá solicitar a chave GPG para a versão mais antiga. <br/> Por favor instale esta chave, exemplo: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </target>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
index 55606ca..693ff5e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
@@ -7013,13 +7013,6 @@ Follow this url to see the full list of inactive systems:
</context-group>
<target>Кикстарт отменён пользователем: {0}</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- <target>Назначен кикстарт системы {0} для более ранней версии Red Hat Enterprise Linux, для чего понадобится GPG-ключ раннего выпуска. <br/> Установите этот ключ: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-КЛЮЧ-redhat </strong> </target>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
index f2841a3..23a3c91 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml
@@ -6354,13 +6354,6 @@ url பின்பற்றி செயலிழக்கப்பட்ட
</context-group>
<target>கிக்ஸ்டார்ட் பயனரால் ரத்து செய்யப்பட்டது: {0}</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- <target>கணினி {0} ஒரு பழைய Red Hat Enterprise Linux பதிப்பை கிக்ஸ்டார்ட் செய்ய திட்டமிடப்பட்டுள்ளது, இதற்கு GPG விசை பழைய வெளியீட்டிற்கு தேவைப்படுகிறது. <br/> இந்த விசையை நிறுவவும் எடுத்துக்காட்டாக: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </target>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
index bd2defe..d16f96c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
@@ -7017,13 +7017,6 @@ Follow this url to see the full list of inactive systems:
</context-group>
<target>Kickstart 被用户取消:{0}</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- <target>预定将系统 {0} kickstart 成一个红帽企业版 Linux 的老版本,它将需要老发行本的 GPG 密钥。<br/>请安装这个密钥,例如:<strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </target>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
index 608db0a..77c194b 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
@@ -7016,13 +7016,6 @@ Follow this url to see the full list of inactive systems:
</context-group>
<target>Kickstart 已由使用者取消:{0}</target>
</trans-unit>
- <trans-unit id="kickstart.schedule.requires.older.gpgkey">
- <source>System {0} is scheduled to be kickstarted to an older version of Red Hat Enterprise Linux, it will require the GPG key for the older release. <br/> Please install this key, example: <strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong> </source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context>
- </context-group>
- <target>系統 {0} 已被排程被 kickstart 至一個較舊版本的 Red Hat Enterprise Linux,它將需要較舊發行版的 GPG key。<br/>請安裝此金鑰,例如:<strong> rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-former </strong></target>
- </trans-unit>
<trans-unit id="kickstart.schedule.success">
<source>System Kickstart scheduled for {0}</source>
<context-group name="ctx">
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 4e7ec8c..27ebc4e 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
@@ -16431,13 +16431,6 @@ Kickstart করার সময় অনুগ্রহ করে সিস্ট
</context-group>
<target>সিস্টেমে চলমান kickstart কর্মের বর্তমান প্রগতি সূচক। <strong>উল্লেখ্য:</strong> প্রতি ১৫ সেকেন্ডে এই পৃষ্ঠাটি নতুন করে প্রদর্শন করা হয়</target>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- <target>সতর্কবার্তা:</target>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
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 ab221e5..bc55b4f 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
@@ -19675,13 +19675,6 @@ den Reiter <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Aktivie
</context-group>
<target>Das ist der momentane Status, der den Fortschritt des Kickstarts dieses Systems angibt. <strong>BEMERKUNG:</strong> Diese Seite wird alle 15 Sekunden aktualisiert.</target>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- <target>Warnung:</target>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
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 f0efc81..8e12f2e 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
@@ -15034,12 +15034,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
<context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
</context-group>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
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 46b88de..11afae1 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
@@ -19670,13 +19670,6 @@ para suscribir los sistemas a los canales de software durante el inicio de insta
</context-group>
<target>Este es el estado actual del progreso Kickstart de este sistema. <strong>NOTA:</strong> Esta página es recargada cada 15 segundos</target>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- <target>Advertencia:</target>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
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 c7c995b..cce8997 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
@@ -19673,13 +19673,6 @@ pour abonner des systèmes aux canaux de logiciels durant le kickstart.</span
</context-group>
<target>Ceci est le statut courant du kickstart du système. <strong>REMARQUE&nbsp;:</strong> Cette page est rafraîchie toutes les 15 secondes</target>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- <target>Avertissement :</target>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
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 55c6daa..d02c5e9 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
@@ -16433,13 +16433,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>આ સિસ્ટમની કિકસ્ટાર્ટની પ્રગતિની આ વર્તમાન પરિસ્થિતિ છે. <strong>નોંધ:</strong> આ પાનું દર ૧૫ સેકન્ડોમાં પુનઃતાજું થાય છે</target>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- <target>ચેતવણી:</target>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
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 654f8f5..cd5ad81 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
@@ -16433,13 +16433,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>इस सिस्टम के किकस्टार्ट प्रक्रिया की यह मौजूदा स्थिति है. <strong>नोट:</strong> यह पृष्ठ हर 15 सेकेंड में ताजा किया जाता है</target>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- <target>चेतावनी:</target>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
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 c881c9e..4632815 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
@@ -19643,13 +19643,6 @@ per sottoscrivere i sistemi ai canali software durante un kickstart.</span>
</context-group>
<target>Questo è lo stato attuale del progresso di kickstart su questo sistema. <strong>NOTA BENE:</strong> Questa pagina viene aggiornata ogni 15 secondi</target>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- <target>Avvertenza:</target>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
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 74cb2aa..add1de6 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
@@ -19655,13 +19655,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>これは、このシステムのキックスタートの現在の進渉状況です。<strong>注記:</strong> このページは 15 秒毎にリフレッシュされます。</target>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- <target>警告:</target>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
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 c861bc6..3aa5e2e 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
@@ -19660,13 +19660,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>이것은 이 시스템의 킥스타트 진행과정에 대한 현재 상태를 나타냅니다. <strong>알림:</strong> 이 패키지는 매 15초 마다 재생됩니다.</target>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- <target>경고: </target>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
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 85f6ba3..dda4035 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
@@ -16432,13 +16432,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>ਇਹ ਇਸ ਸਿਸਟਮ ਦੀ ਕਿੱਕਸਟਾਰਟ ਤਰੱਕੀ ਦੀ ਵਰਤਮਾਨ ਸਥਿਤੀ ਹੈ। <strong>ਸੂਚਨਾ:</strong> ਇਹ ਸਫਾ ਹਰ 15 ਸਕਿੰਟਾਂ ਬਾਅਦ ਮੁੜ ਤਾਜ਼ਾ ਹੁੰਦਾ ਹੈ।</target>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- <target>ਚੇਤਾਵਨੀ:</target>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
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 ba493ab..362c312 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
@@ -19669,13 +19669,6 @@ a aba <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Chaves de At
</context-group>
<target>Este é o status do progresso do Kickstart deste sistema. <strong>NOTA:</strong> Esta página recarrega a cada 15 segundos</target>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- <target>Aviso:</target>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
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 418c96c..b51a53d 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
@@ -19656,13 +19656,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>Текущий статус прогресса кикстарта. <strong>Замечание:</strong> Обновление страницы происходит каждые 15 секунд</target>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- <target>Внимание:</target>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
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 1a285d4..b98715b 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
@@ -16433,13 +16433,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>இது கணினியின் கிக்ஸ்டார்ட் பணியின் நடப்பு நிலையாகும். <strong>குறிப்பு:</strong> இந்தப் பக்கம் ஒவ்வொரு 15 விநாடிக்கும் புதுப்பிக்கப்படும்</target>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- <target>எச்சரிக்கை:</target>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
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 dad2850..59d52a7 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
@@ -19667,13 +19667,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>这是这个系统的 kickstart 进程的当前状态。<strong>注意:</strong>这个页面每 15 秒更新一次。</target>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- <target>警告:</target>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
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 a7e2ea1..32701cf 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
@@ -19670,13 +19670,6 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Activation Key
</context-group>
<target>這是本系統 Kickstart 目前的紀頓。<strong>注意:</strong>本網頁每 15 秒更新一次</target>
</trans-unit>
- <trans-unit id="kickstart.session_status.jsp.warning">
- <source>Warning:</source>
- <context-group name="ctx">
- <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionStatus.do</context>
- </context-group>
- <target>警告:</target>
- </trans-unit>
<trans-unit id="kickstart.session_status.jsp.progress">
<source>Kickstart Progress</source>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp
index c0ac8ba..15f78e8 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp
@@ -45,24 +45,6 @@
<p>
<bean:message key="kickstart.session_status.jsp.summary2"/>
</p>
-<c:if test="${kswarning != null}">
- <p>
- <table class="warning">
- <tr>
- <td>
- <strong>
- <bean:message key="kickstart.session_status.jsp.warning"/>
- </strong>
- </td>
- </tr>
- <tr>
- <td>
- ${kswarning}
- </td>
- </tr>
- </table>
- </p>
-</c:if>
<table>
<tr>
<td>
10 years, 10 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cd72b62c5f745b14fc8f5412972cd36f8195fd2f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 29 12:04:58 2013 +0200
512433 - grammatical typo
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 180ac89..f0efc81 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
@@ -4071,7 +4071,7 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
</trans-unit>
<trans-unit id="errata.publish.packagepush.description">
- <source>The channel <strong>{0}</strong> has different versions of these packages, or does not have the packages at all. Select the packages you want push into this channel below, and click 'Continue'.</source>
+ <source>The channel <strong>{0}</strong> has different versions of these packages, or does not have the packages at all. Select the packages you want to push into this channel below, and click 'Continue'.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/errata/manage/PackagePush.do</context>
</context-group>
10 years, 10 months
Changes to 'refs/tags/spacewalk-backend-1.10.41-1'
by Michael Mraka
Tag 'spacewalk-backend-1.10.41-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-05-29 08:49 +0000
Tagging package [spacewalk-backend] version [1.10.41-1] in directory [backend/].
Changes since spacewalk-schema-1.10.41-1:
Michael Mraka (2):
967850 - don't change global configuration component for reading product name
Automatic commit of package [spacewalk-backend] release [1.10.41-1].
---
backend/common/rhnConfig.py | 3 +++
backend/common/rhnException.py | 5 ++---
backend/satellite_tools/disk_dumper/iss_ui.py | 5 ++---
backend/satellite_tools/geniso.py | 7 +++----
backend/satellite_tools/satsync.py | 4 +---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
7 files changed, 16 insertions(+), 15 deletions(-)
---
10 years, 10 months
2 commits - backend/common backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/common/rhnConfig.py | 3 +++
backend/common/rhnException.py | 5 ++---
backend/satellite_tools/disk_dumper/iss_ui.py | 5 ++---
backend/satellite_tools/geniso.py | 7 +++----
backend/satellite_tools/satsync.py | 4 +---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
7 files changed, 16 insertions(+), 15 deletions(-)
New commits:
commit 21a7217c5a386ffe1819545bbc046403a115610c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 29 10:49:38 2013 +0200
Automatic commit of package [spacewalk-backend] release [1.10.41-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index da4f3a5..12aedce 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.10.40
+Version: 1.10.41
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed May 29 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.41-1
+- 967850 - don't change global configuration component for reading product name
+
* Tue May 28 2013 Stephen Herr <sherr(a)redhat.com> 1.10.40-1
- 948335 - adding new server client capability for cpu_sockets
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 37e1131..3e0221c 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.10.40-1 backend/
+1.10.41-1 backend/
commit 881d1cc902a2128ee98fdba13bad1cd3b842724b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 29 10:27:23 2013 +0200
967850 - don't change global configuration component for reading product name
diff --git a/backend/common/rhnConfig.py b/backend/common/rhnConfig.py
index a7cbb28..6488cd3 100644
--- a/backend/common/rhnConfig.py
+++ b/backend/common/rhnConfig.py
@@ -518,6 +518,9 @@ def initCFG(component=None, root=None, filename=None):
CFG.init(component, root, filename)
CFG.parse()
+WEB_CFG = RHNOptions('web')
+WEB_CFG.parse()
+PRODUCT_NAME = WEB_CFG.PRODUCT_NAME
def runTest():
print "Test script:"
diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py
index 6db1316..5e3ee56 100644
--- a/backend/common/rhnException.py
+++ b/backend/common/rhnException.py
@@ -16,7 +16,7 @@
import sys
import xmlrpclib
-from spacewalk.common.rhnConfig import CFG, initCFG
+from spacewalk.common.rhnConfig import PRODUCT_NAME
from cStringIO import StringIO
@@ -24,7 +24,6 @@ from cStringIO import StringIO
from rhnTranslate import _
import rhnFlags
-initCFG('web')
# default template values for error messages
templateValues = {
@@ -109,7 +108,7 @@ on this system."),
Invalid architecture.
The architecture of the package is not supported by
- """ + CFG.PRODUCT_NAME),
+ """ + PRODUCT_NAME),
47: _("""Invalid RPM header"""),
# For the uploading tools
50: _("Invalid information uploaded to the server"),
diff --git a/backend/satellite_tools/disk_dumper/iss_ui.py b/backend/satellite_tools/disk_dumper/iss_ui.py
index a2d374e..fd16d5e 100644
--- a/backend/satellite_tools/disk_dumper/iss_ui.py
+++ b/backend/satellite_tools/disk_dumper/iss_ui.py
@@ -14,7 +14,7 @@
#
from optparse import OptionParser, Option
-from spacewalk.common.rhnConfig import CFG, initCFG
+from spacewalk.common.rhnConfig import PRODUCT_NAME
#Not strictly necessary, but makes them easier to type
option_parser = OptionParser
@@ -22,7 +22,6 @@ option = Option
class UI:
def __init__(self):
- initCFG('web')
self.optiontable = [
option("-d", "--dir", action="store",
help="This is the directory that the information that you want to sync gets dumped in."),
@@ -41,7 +40,7 @@ class UI:
option( "--end-date", action="store",
help="The end date limit that the last modified dates are compared against. Should be in the format 'YYYYMMDDHH24MISS'."),
option( "--use-rhn-date", action="store_true",
- help="Limit exported packages according to the date when they appeared at " + CFG.PRODUCT_NAME + "."),
+ help="Limit exported packages according to the date when they appeared at %s." % PRODUCT_NAME),
option( "--use-sync-date", action="store_true",
help="Limit exported packages according to the date they where pulled into satellite."),
option( "--whole-errata", action="store_true",
diff --git a/backend/satellite_tools/geniso.py b/backend/satellite_tools/geniso.py
index 182c78a..bca491b 100644
--- a/backend/satellite_tools/geniso.py
+++ b/backend/satellite_tools/geniso.py
@@ -19,7 +19,7 @@ import sys
import time
from stat import ST_SIZE
from optparse import Option, OptionParser
-from spacewalk.common.rhnConfig import CFG, initCFG
+from spacewalk.common.rhnConfig import PRODUCT_NAME
import tempfile
MOUNT_POINT = '/tmp'
@@ -126,10 +126,9 @@ def main(arglist):
pathfiles_fd, pathfiles = tempfile.mkstemp(dir = '/tmp', prefix = 'geniso-')
# Command-line options; the keys are supposed to start with a dash
- initCFG('web')
opts = {
- 'preparer' : CFG.PRODUCT_NAME,
- 'publisher' : CFG.PRODUCT_NAME,
+ 'preparer' : PRODUCT_NAME,
+ 'publisher' : PRODUCT_NAME,
'volid' : "RHNSAT_%s/%s" % (i+1, cdcount),
'path-list' : pathfiles,
}
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 8976a8b..e83bf7f 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -38,7 +38,7 @@ _ = t.ugettext
# __rhn imports__
from spacewalk.common import rhnMail, rhnLib, rhnFlags
from spacewalk.common.rhnLog import initLOG
-from spacewalk.common.rhnConfig import CFG, initCFG
+from spacewalk.common.rhnConfig import CFG, initCFG, PRODUCT_NAME
from spacewalk.common.rhnTB import exitWithTraceback
sys.path.append("/usr/share/rhn")
from up2date_client import config
@@ -51,8 +51,6 @@ from spacewalk.server.rhnServer import satellite_cert, server_packages
from spacewalk.server.rhnLib import get_package_path
from spacewalk.common import fileutils
-initCFG('web')
-PRODUCT_NAME = CFG.PRODUCT_NAME
initCFG('server.satellite')
initLOG(CFG.LOG_FILE, CFG.DEBUG)
10 years, 10 months
Changes to 'refs/tags/spacewalk-schema-1.10.41-1'
by Šimon Lukašík
Tag 'spacewalk-schema-1.10.41-1' created by Simon Lukasik <slukasik(a)redhat.com> at 2013-05-29 07:50 +0000
Tagging package [spacewalk-schema] version [1.10.41-1] in directory [schema/spacewalk/].
Changes since rhn-client-tools-1.10.7-1:
Simon Lukasik (2):
Do not use identifiers of excessive length for constraints.
Automatic commit of package [spacewalk-schema] release [1.10.41-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/common/tables/rhnOrgConfiguration.sql | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
10 years, 10 months
rel-eng/packages schema/spacewalk
by Šimon Lukašík
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 7a7d69371a8546c7d5730bde41c5d25a263b09ac
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed May 29 09:50:59 2013 +0200
Automatic commit of package [spacewalk-schema] release [1.10.41-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 01e4c72..c7b6f08 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.10.40-1 schema/spacewalk/
+1.10.41-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 11cdd8d..da13bb5 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.10.40
+Version: 1.10.41
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed May 29 2013 Simon Lukasik <slukasik(a)redhat.com> 1.10.41-1
+- Do not use identifiers of excessive length for constraints.
+
* Tue May 28 2013 Simon Lukasik <slukasik(a)redhat.com> 1.10.40-1
- Store SCAP-file-limit to the database
10 years, 10 months
schema/spacewalk
by Šimon Lukašík
schema/spacewalk/common/tables/rhnOrgConfiguration.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a43677a34690f63e72f8ea2a01afd70bc8489085
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed May 29 09:49:21 2013 +0200
Do not use identifiers of excessive length for constraints.
Even the sizelimit must not exceed size limit.
Addressing:
constraint rhn_org_conf_scap_sizelimit_chk
ERROR at line 29:
ORA-00972: identifier is too long.
diff --git a/schema/spacewalk/common/tables/rhnOrgConfiguration.sql b/schema/spacewalk/common/tables/rhnOrgConfiguration.sql
index c004ef0..9aeb1c3 100644
--- a/schema/spacewalk/common/tables/rhnOrgConfiguration.sql
+++ b/schema/spacewalk/common/tables/rhnOrgConfiguration.sql
@@ -41,7 +41,7 @@ create table rhnOrgConfiguration
check (scapfile_upload_enabled in ('Y', 'N')),
scap_file_sizelimit number
default(2097152) not null
- constraint rhn_org_conf_scap_sizelimit_chk
+ constraint rhn_org_conf_scap_szlmt_chk
check (scap_file_sizelimit >= 0),
created timestamp with local time zone
default (current_timestamp) not null,
10 years, 10 months
Changes to 'refs/tags/rhn-client-tools-1.10.7-1'
by StephenHerr
Tag 'rhn-client-tools-1.10.7-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-05-28 21:12 +0000
Tagging package [rhn-client-tools] version [1.10.7-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-backend-1.10.40-1:
Stephen Herr (1):
Automatic commit of package [rhn-client-tools] release [1.10.7-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 10 months