April 2012 - spacewalk-commits - Fedora mailing-lists

Changes to 'refs/tags/spacewalk-java-1.8.41-1'
by Tomas Lestach 11 Apr '12

11 Apr '12

Tag 'spacewalk-java-1.8.41-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-04-11 09:47 +0000 Tagging package [spacewalk-java] version [1.8.41-1] in directory [java/]. Changes since spacewalk-java-1.8.40-1: Tomas Lestach (2): adding javadoc to public RhnPostMockStrutsTestCase method Automatic commit of package [spacewalk-java] release [1.8.41-1]. --- java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java | 4 ++++ java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) ---

1 0

2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 11 Apr '12

11 Apr '12

java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java | 4 ++++ java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) New commits: commit d2b3484b16b675364874c43ad66730951d8ee6b8 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 11:47:28 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.41-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 75b0361..39d32cc 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.40 +Version: 1.8.41 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,10 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Apr 11 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.41-1 +- adding javadoc to public RhnPostMockStrutsTestCase method + (tlestach(a)redhat.com) + * Wed Apr 11 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.40-1 - fix BaseKickstartEditTestCase tests (tlestach(a)redhat.com) - fix VirtualGuestsActionTest (tlestach(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index e9d4fdf..87f21ca 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.40-1 java/ +1.8.41-1 java/ commit 2d29845b46b330ba393d96a9aa94eb5da871b3e5 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 11:41:30 2012 +0200 adding javadoc to public RhnPostMockStrutsTestCase method diff --git a/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java b/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java index bd17b33..3c4d475 100644 --- a/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java +++ b/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java @@ -23,6 +23,10 @@ import servletunit.HttpServletRequestSimulator; */ public class RhnPostMockStrutsTestCase extends RhnMockStrutsTestCase { + /** + * override the setupUp method + * {@inheritDoc} + */ public void setUp() throws Exception { super.setUp(); request.setMethod(HttpServletRequestSimulator.POST);

1 0

Changes to 'refs/tags/spacewalk-java-1.8.40-1'
by Tomas Lestach 11 Apr '12

11 Apr '12

Tag 'spacewalk-java-1.8.40-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-04-11 09:27 +0000 Tagging package [spacewalk-java] version [1.8.40-1] in directory [java/]. Changes since osad-5.10.44-1: Jan Pazdziora (1): 787225 - the Log Size actually checks Log Size Growth. Milan Zazrivec (1): 810313 - new option to list snapshot details Tomas Lestach (36): statements cannot end with ";" for Oracle create RhnPostMockStrutsTestCase for testing POST methods fix CloneConfirmActionTest fix CreateUserActionTest fix KickstartPartitionActionTest fix PreservationListEditActionTest fix SystemDetailsEditActionTest fix CertificateConfigActionTest fix CryptoKeyCreateActionTest fix KickstartIpRangeActionTest fix RestartActionTest fix GeneralConfigActionTest fix BaseSetOperateOnDiffActionTest fix CompletedActionsSetupActionTest fix CryptoKeyDeleteActionTest fix KickstartAdvancedOptionsActionTest fix errata/test/ErrataConfirmActionTest fix systems/test/ErrataConfirmActionTest fix TreeActionTest fix TreeActionTest.testCreateRefresh fix TreeActionTest - need to set ks tree installtype fix OrgSoftwareSubscriptionsActionTest fix FailedActionsSetupActionTest fix ErrataActionTest fix OrgCreateActionTest fix RegisteredSetupActionTest fix ChannelFilesImportTest fix SystemEntitlementsSubmitActionTest fix OrgSystemSubscriptionsActionTest fix KickstartEditPackagesTest fix BootstrapConfigActionTest fix PendingActionsSetupActionTest fix MethodActionTest fix VirtualGuestsActionTest fix BaseKickstartEditTestCase tests Automatic commit of package [spacewalk-java] release [1.8.40-1]. --- java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java | 6 - java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java | 8 + java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml | 6 - java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml | 4 java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java | 4 java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java | 30 +++++++ java/spacewalk-java.spec | 42 +++++++++- rel-eng/packages/spacewalk-java | 2 schema/spacewalk/common/data/rhn_command.sql | 2 schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-rhn_command-check_log_size.sql | 3 utils/sw-system-snapshot.sgml | 10 ++ utils/systemSnapshot.py | 41 +++++++-- 56 files changed, 224 insertions(+), 110 deletions(-) ---

1 0

36 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 11 Apr '12

11 Apr '12

java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java | 6 - java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java | 8 + java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java | 4 java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java | 4 java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java | 30 +++++++ java/spacewalk-java.spec | 42 +++++++++- rel-eng/packages/spacewalk-java | 2 36 files changed, 144 insertions(+), 68 deletions(-) New commits: commit 4780a8086810dce0b4cf84c3110582ba1639d6fe Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 11:27:55 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.40-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index a1d852b..75b0361 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.39 +Version: 1.8.40 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,46 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Apr 11 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.40-1 +- fix BaseKickstartEditTestCase tests (tlestach(a)redhat.com) +- fix VirtualGuestsActionTest (tlestach(a)redhat.com) +- fix MethodActionTest (tlestach(a)redhat.com) +- fix PendingActionsSetupActionTest (tlestach(a)redhat.com) +- fix BootstrapConfigActionTest (tlestach(a)redhat.com) +- fix KickstartEditPackagesTest (tlestach(a)redhat.com) +- fix OrgSystemSubscriptionsActionTest (tlestach(a)redhat.com) +- fix SystemEntitlementsSubmitActionTest (tlestach(a)redhat.com) +- fix ChannelFilesImportTest (tlestach(a)redhat.com) +- fix RegisteredSetupActionTest (tlestach(a)redhat.com) +- fix OrgCreateActionTest (tlestach(a)redhat.com) +- fix ErrataActionTest (tlestach(a)redhat.com) +- fix FailedActionsSetupActionTest (tlestach(a)redhat.com) +- fix OrgSoftwareSubscriptionsActionTest (tlestach(a)redhat.com) +- fix TreeActionTest - need to set ks tree installtype (tlestach(a)redhat.com) +- fix TreeActionTest.testCreateRefresh (tlestach(a)redhat.com) +- fix TreeActionTest (tlestach(a)redhat.com) +- fix systems/test/ErrataConfirmActionTest (tlestach(a)redhat.com) +- fix errata/test/ErrataConfirmActionTest (tlestach(a)redhat.com) +- fix KickstartAdvancedOptionsActionTest (tlestach(a)redhat.com) +- fix CryptoKeyDeleteActionTest (tlestach(a)redhat.com) +- fix CompletedActionsSetupActionTest (tlestach(a)redhat.com) +- fix BaseSetOperateOnDiffActionTest (tlestach(a)redhat.com) +- fix GeneralConfigActionTest (tlestach(a)redhat.com) +- fix RestartActionTest (tlestach(a)redhat.com) +- fix KickstartIpRangeActionTest (tlestach(a)redhat.com) +- fix CryptoKeyCreateActionTest (tlestach(a)redhat.com) +- fix CertificateConfigActionTest (tlestach(a)redhat.com) +- fix SystemDetailsEditActionTest (tlestach(a)redhat.com) +- fix PreservationListEditActionTest (tlestach(a)redhat.com) +- fix KickstartPartitionActionTest (tlestach(a)redhat.com) +- fix CreateUserActionTest (tlestach(a)redhat.com) +- fix CloneConfirmActionTest (tlestach(a)redhat.com) +- create RhnPostMockStrutsTestCase for testing POST methods + (tlestach(a)redhat.com) +- statements cannot end with ";" for Oracle (tlestach(a)redhat.com) +- 787225 - the Log Size actually checks Log Size Growth. + (jpazdziora(a)redhat.com) + * Tue Apr 10 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.39-1 - fix ServerConfigHandlerTest revision comparism (tlestach(a)redhat.com) - fix ServerConfigHandlerTest.createRevision (tlestach(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 11a2815..e9d4fdf 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.39-1 java/ +1.8.40-1 java/ commit aa8b4bcf7e0e385573ddb480aefa36303cb06825 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 11:26:26 2012 +0200 fix BaseKickstartEditTestCase tests diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java index c8b8a48..1cf60f9 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/BaseKickstartEditTestCase.java @@ -19,7 +19,7 @@ import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils; @@ -29,7 +29,7 @@ import java.util.List; * KickstartDetailsEditTest * @version $Rev: 1 $ */ -public class BaseKickstartEditTestCase extends RhnMockStrutsTestCase { +public class BaseKickstartEditTestCase extends RhnPostMockStrutsTestCase { protected KickstartData ksdata; commit 16b7733ba59559cc4e135e87f18ea1997d788f10 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 11:25:29 2012 +0200 fix VirtualGuestsActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java index 8897eb4..80bf3e9 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/VirtualGuestsActionTest.java @@ -29,7 +29,7 @@ import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.taglibs.ListDisplayTag; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.ServerTestUtils; import com.redhat.rhn.testing.TestUtils; @@ -44,7 +44,7 @@ import java.util.Map; * VirtualGuestsListActionTest * @version $Rev$ */ -public class VirtualGuestsActionTest extends RhnMockStrutsTestCase { +public class VirtualGuestsActionTest extends RhnPostMockStrutsTestCase { private RhnSet submitVirtualGuestsForm(String dispatch, Map requestParams) throws Exception { commit 8bf75589018b55f319d37c4ba7d18096a7c4f802 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 11:24:26 2012 +0200 fix MethodActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java index 69bab53..6cc4942 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodActionTest.java @@ -24,11 +24,11 @@ import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnHelper; import com.redhat.rhn.manager.monitoring.ModifyMethodCommand; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils; -public class MethodActionTest extends RhnMockStrutsTestCase { +public class MethodActionTest extends RhnPostMockStrutsTestCase { private String expectedName = "Expected Method Name"; commit fe4ea1c5192eae52ba86d45c643e63b5bd5069b0 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 11:23:22 2012 +0200 fix PendingActionsSetupActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java index bd60ba4..6bf094f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/PendingActionsSetupActionTest.java @@ -24,14 +24,14 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; /** * PendingActionsSetupActionTest * @version $Rev$ */ -public class PendingActionsSetupActionTest extends RhnMockStrutsTestCase { +public class PendingActionsSetupActionTest extends RhnPostMockStrutsTestCase { commit 2d70e914f53b0875486fc86971296aacc9eb06a9 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 11:22:32 2012 +0200 fix BootstrapConfigActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java index b5bae12..aea657d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java @@ -19,7 +19,7 @@ import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.action.satellite.BootstrapConfigAction; import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import org.apache.struts.action.DynaActionForm; @@ -27,7 +27,7 @@ import org.apache.struts.action.DynaActionForm; * BootstrapConfigActionTest * @version $Rev: 1 $ */ -public class BootstrapConfigActionTest extends RhnMockStrutsTestCase { +public class BootstrapConfigActionTest extends RhnPostMockStrutsTestCase { /** * {@inheritDoc} commit ebbc0972405157ef525a821ccea0836da41ace80 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 11:21:40 2012 +0200 fix KickstartEditPackagesTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java index 028f774..b5cde5b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartEditPackagesTest.java @@ -15,9 +15,9 @@ package com.redhat.rhn.frontend.action.kickstart.test; import com.redhat.rhn.domain.kickstart.KickstartData; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; -public class KickstartEditPackagesTest extends RhnMockStrutsTestCase { +public class KickstartEditPackagesTest extends RhnPostMockStrutsTestCase { public void testDisplay() throws Exception { KickstartData k = KickstartTestHelper.createTestKickStart(user); commit 8e56af7c5fda9180efb72eb598ea72e470c1cfcd Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 11:18:54 2012 +0200 fix OrgSystemSubscriptionsActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java index 6ff80c0..45421e5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java @@ -17,7 +17,7 @@ package com.redhat.rhn.frontend.action.multiorg.test; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.entitlement.EntitlementManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import org.apache.struts.action.DynaActionForm; @@ -25,7 +25,7 @@ import org.apache.struts.action.DynaActionForm; * OrgSubscriptionsActionTest * @version $Rev: 1 $ */ -public class OrgSystemSubscriptionsActionTest extends RhnMockStrutsTestCase { +public class OrgSystemSubscriptionsActionTest extends RhnPostMockStrutsTestCase { public void testExecute() throws Exception { user.getOrg().addRole(RoleFactory.SAT_ADMIN); commit 0e4037cf3e2865a8b6012b620fe433d1889be5dc Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 11:18:02 2012 +0200 fix SystemEntitlementsSubmitActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java index a4db320..6336ded 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java @@ -28,7 +28,7 @@ import com.redhat.rhn.frontend.action.systems.entitlements.SystemEntitlementsSub import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.system.SystemManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.ServerGroupTestUtils; import com.redhat.rhn.testing.ServerTestUtils; import com.redhat.rhn.testing.TestUtils; @@ -40,7 +40,7 @@ import java.util.Iterator; * SystemEntitlementSubmitActionToast * @version $Rev$ */ -public class SystemEntitlementsSubmitActionTest extends RhnMockStrutsTestCase { +public class SystemEntitlementsSubmitActionTest extends RhnPostMockStrutsTestCase { private static final String UPDATE = "system_entitlements.setToUpdateEntitled"; commit 5f3622950dc1d54b6d4705b8c31e1ec057fa8c30 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 11:16:27 2012 +0200 fix ChannelFilesImportTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java index dc04fe9..2023558 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesImportTest.java @@ -17,7 +17,7 @@ package com.redhat.rhn.frontend.action.configuration.test; import com.redhat.rhn.domain.config.ConfigChannel; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.testing.ConfigTestUtils; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.UserTestUtils; /** @@ -25,7 +25,7 @@ import com.redhat.rhn.testing.UserTestUtils; * ChannelFilesImportTest * @version $Rev$ */ -public class ChannelFilesImportTest extends RhnMockStrutsTestCase { +public class ChannelFilesImportTest extends RhnPostMockStrutsTestCase { public void testExecuteNoFiles() throws Exception { UserTestUtils.addUserRole(user, RoleFactory.CONFIG_ADMIN); commit ed04c02a3974fca2f0b69267c72c02cd79e79aa7 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 11:14:46 2012 +0200 fix RegisteredSetupActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java index c148234..cd8b51c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java @@ -26,13 +26,13 @@ import com.redhat.rhn.domain.server.test.ServerGroupTest; import com.redhat.rhn.frontend.action.systems.RegisteredSetupAction; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.system.SystemManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; /** * RegisteredSetupActionTest * @version $Rev$ */ -public class RegisteredSetupActionTest extends RhnMockStrutsTestCase { +public class RegisteredSetupActionTest extends RhnPostMockStrutsTestCase { public void setUp() throws Exception { super.setUp(); commit abaeeb0bc932cbca6e1b0084bf1844425b317b8f Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 11:06:41 2012 +0200 fix OrgCreateActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java index c54f509..54af9e4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgCreateActionTest.java @@ -15,14 +15,14 @@ package com.redhat.rhn.frontend.action.multiorg.test; import com.redhat.rhn.domain.role.RoleFactory; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; /** * OrgCreateActionTest - test org create * @version $Rev: 119601 $ */ -public class OrgCreateActionTest extends RhnMockStrutsTestCase { +public class OrgCreateActionTest extends RhnPostMockStrutsTestCase { public void testExecuteSubmit() throws Exception { user.getOrg().addRole(RoleFactory.SAT_ADMIN); commit ea639d39c1e63faa6550c51974e546e24906e58b Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 11:04:44 2012 +0200 fix ErrataActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java index 09cfd6f..ed4e9be 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java @@ -30,13 +30,13 @@ import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.errata.cache.ErrataCacheManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; /** * ErrataActionTest * @version $Rev$ */ -public class ErrataActionTest extends RhnMockStrutsTestCase { +public class ErrataActionTest extends RhnPostMockStrutsTestCase { public void testEmptySelection() throws Exception { String pathInfo = "/systems/details/ErrataList"; setRequestPathInfo(pathInfo); commit f1ac6e32bb7abe7c105992ad9734d79530e75eb2 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 10:55:47 2012 +0200 fix FailedActionsSetupActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java index 9477688..6db5f5e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/FailedActionsSetupActionTest.java @@ -24,14 +24,14 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; /** * FailedActionsSetupActionTest * @version $Rev$ */ -public class FailedActionsSetupActionTest extends RhnMockStrutsTestCase { +public class FailedActionsSetupActionTest extends RhnPostMockStrutsTestCase { public void setUp() throws Exception { commit 459c2a575f5feb2fc6d362e163b8d3256b86154d Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 10:52:22 2012 +0200 fix OrgSoftwareSubscriptionsActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java index 59d4a5a..dcf370f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java @@ -22,7 +22,7 @@ import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; import java.util.HashMap; @@ -34,7 +34,7 @@ import java.util.Map; * OrgSoftwareSubscriptionsActionTest * @version $Rev: 1 $ */ -public class OrgSoftwareSubscriptionsActionTest extends RhnMockStrutsTestCase { +public class OrgSoftwareSubscriptionsActionTest extends RhnPostMockStrutsTestCase { public void testExecute() throws Exception { user.getOrg().addRole(RoleFactory.SAT_ADMIN); commit 2120690474f83ec0d7ff8cf28d23cee75a7e51f6 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 11 10:49:32 2012 +0200 fix TreeActionTest - need to set ks tree installtype diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java index 8be218d..f210e54 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java @@ -19,6 +19,7 @@ import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.test.ChannelFactoryTest; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; +import com.redhat.rhn.domain.kickstart.KickstartInstallType; import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.domain.kickstart.test.KickstartableTreeTest; @@ -208,6 +209,9 @@ public class TreeActionTest extends RhnPostMockStrutsTestCase { addRequestParameter(TreeCreateAction.CHANNEL_ID, c.getId().toString()); addRequestParameter(TreeCreateAction.LABEL, newLabel); + KickstartInstallType installtype = (KickstartInstallType) + TestUtils.lookupFromCacheById(1L, "KickstartInstallType.findById"); + addRequestParameter(TreeCreateAction.INSTALL_TYPE, installtype.getLabel()); actionPerform(); verifyNoActionErrors(); return newLabel; commit e2b5f0a4e8da16604249b06c17c0c2535e8139bf Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 17:10:11 2012 +0200 fix TreeActionTest.testCreateRefresh diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java index 705dcfd..0def9ab 100644 --- a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java @@ -500,11 +500,11 @@ public class PackageManagerTest extends BaseTestCaseWithUser { Map params = new HashMap(); params.put("pkg_id", kickstartPkg.getId()); params.put("capability_id", kickstartCapability.getId()); - params.put("sense_id", "8"); + params.put("sense_id", 8); m.executeUpdate(params); // Repeast for another sense: - params.put("sense_id", "268435464"); + params.put("sense_id", 268435464); m.executeUpdate(params); } commit 2a3fd8c6bd9d7cb9992e90fec5490db4517c2d3f Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 17:06:46 2012 +0200 fix TreeActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java index efddab8..8be218d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java @@ -30,7 +30,7 @@ import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest; import com.redhat.rhn.testing.ChannelTestUtils; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils; @@ -43,7 +43,7 @@ import java.util.List; * TreeCreateTest * @version $Rev: 1 $ */ -public class TreeActionTest extends RhnMockStrutsTestCase { +public class TreeActionTest extends RhnPostMockStrutsTestCase { public void testCreateNonSubmit() throws Exception { UserTestUtils.addUserRole(user, RoleFactory.CONFIG_ADMIN); commit 1a05b62356a79f95f575bfa9892add4d9b638517 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 17:05:47 2012 +0200 fix systems/test/ErrataConfirmActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java index fcc3073..82d1f91 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataConfirmActionTest.java @@ -28,7 +28,7 @@ import com.redhat.rhn.frontend.context.Context; import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import java.util.TimeZone; @@ -36,7 +36,7 @@ import java.util.TimeZone; * ErrataConfirmActionTest * @version $Rev$ */ -public class ErrataConfirmActionTest extends RhnMockStrutsTestCase { +public class ErrataConfirmActionTest extends RhnPostMockStrutsTestCase { public void setUp() throws Exception { super.setUp(); commit d6632e802f1a99e6d23c506e3d13684e1c7572c8 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 17:05:00 2012 +0200 fix errata/test/ErrataConfirmActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java index 3554be4..7bd0196 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmActionTest.java @@ -23,14 +23,14 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; /** * ErrataConfirmActionTest - test that ErrataConfirmAction correctly * schedules the Actions associated with the Errata * @version $Rev$ */ -public class ErrataConfirmActionTest extends RhnMockStrutsTestCase { +public class ErrataConfirmActionTest extends RhnPostMockStrutsTestCase { public void testExecute() throws Exception { setRequestPathInfo("/errata/details/ErrataConfirmSubmit"); commit 91e66992a400aeb2922d4cd9f75a52d0aa073103 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 17:03:44 2012 +0200 fix KickstartAdvancedOptionsActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java index 9144edc..30d8402 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartAdvancedOptionsActionTest.java @@ -18,14 +18,14 @@ import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.frontend.action.kickstart.KickstartAdvancedOptionsAction; import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; /** * KickstartAdvancedOptionsTest * @version $Rev: 1 $ */ -public class KickstartAdvancedOptionsActionTest extends RhnMockStrutsTestCase { +public class KickstartAdvancedOptionsActionTest extends RhnPostMockStrutsTestCase { protected KickstartData ksdata; protected KickstartData ksdataOptions; commit 8cf9a650729a6f37b92892fa09f3f3eba6ae78ee Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 17:02:54 2012 +0200 fix CryptoKeyDeleteActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java index 9a4308b..79b92e7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyDeleteActionTest.java @@ -20,13 +20,13 @@ import com.redhat.rhn.frontend.action.keys.CryptoKeyCreateAction; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.kickstart.crypto.CreateCryptoKeyCommand; import com.redhat.rhn.manager.kickstart.crypto.test.CryptoKeyCommandTest; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; /** * CryptoKeyDeleteActionTest * @version $Rev: 1 $ */ -public class CryptoKeyDeleteActionTest extends RhnMockStrutsTestCase { +public class CryptoKeyDeleteActionTest extends RhnPostMockStrutsTestCase { private CreateCryptoKeyCommand cmd; commit e146c2b2e94b5b77b446b526db203b2c5f1291f4 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 17:02:00 2012 +0200 fix CompletedActionsSetupActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java index 7b1f534..71545f1 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedActionsSetupActionTest.java @@ -24,14 +24,14 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; /** * CompletedActionsSetupActionTest * @version $Rev$ */ -public class CompletedActionsSetupActionTest extends RhnMockStrutsTestCase { +public class CompletedActionsSetupActionTest extends RhnPostMockStrutsTestCase { public void setUp() throws Exception { super.setUp(); commit 7399a59917ebb1a0446b686b53035935b06d89fc Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 17:01:04 2012 +0200 fix BaseSetOperateOnDiffActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java index c0d7a1e..0808198 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/common/test/BaseSetOperateOnDiffActionTest.java @@ -24,14 +24,14 @@ import com.redhat.rhn.frontend.action.kickstart.ActivationKeysSubmitAction; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.taglibs.ListDisplayTag; import com.redhat.rhn.manager.rhnset.RhnSetDecl; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; /** * BaseSetOperateOnDiffActionTest * @version $Rev$ */ -public class BaseSetOperateOnDiffActionTest extends RhnMockStrutsTestCase { +public class BaseSetOperateOnDiffActionTest extends RhnPostMockStrutsTestCase { // We use activation keys <-> to kickstart profile to test this. // I wanted to make sure we had a specific test class that was tied commit f97e630360c97968f49e75bba24cd0e8a403f9c6 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 17:00:10 2012 +0200 fix GeneralConfigActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java index 07e3d31..296dcb7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/GeneralConfigActionTest.java @@ -19,7 +19,7 @@ import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.action.satellite.GeneralConfigAction; import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import org.apache.struts.action.DynaActionForm; @@ -31,7 +31,7 @@ import java.util.Map; * GeneralConfigActionTest * @version $Rev: 1 $ */ -public class GeneralConfigActionTest extends RhnMockStrutsTestCase { +public class GeneralConfigActionTest extends RhnPostMockStrutsTestCase { private static final String TEST_CONFIG_BOOLEAN = ConfigDefaults.WEB_IS_MONITORING_BACKEND; commit 78d9017adf49b15944230ac203037505de37fa0d Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 16:58:46 2012 +0200 fix RestartActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java index 3c6c0bd..41a1091 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/RestartActionTest.java @@ -18,7 +18,7 @@ import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.action.satellite.RestartAction; import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import org.apache.struts.action.DynaActionForm; @@ -26,7 +26,7 @@ import org.apache.struts.action.DynaActionForm; * RestartActionTest * @version $Rev: 1 $ */ -public class RestartActionTest extends RhnMockStrutsTestCase { +public class RestartActionTest extends RhnPostMockStrutsTestCase { /** * {@inheritDoc} commit 9a94d3ecd55dc68194eb88c7bd2e8226e8cbb748 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 16:57:36 2012 +0200 fix KickstartIpRangeActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java index 7258cfd..ae8f6fa 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpRangeActionTest.java @@ -23,7 +23,7 @@ import com.redhat.rhn.frontend.action.kickstart.KickstartIpRangeAction; import com.redhat.rhn.frontend.action.kickstart.KickstartIpRangeDeleteAction; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.kickstart.IpAddress; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; import java.util.Date; @@ -32,7 +32,7 @@ import java.util.Date; * KickstartIpRangeActionTest * @version $Rev: 1 $ */ -public class KickstartIpRangeActionTest extends RhnMockStrutsTestCase { +public class KickstartIpRangeActionTest extends RhnPostMockStrutsTestCase { protected KickstartData ksdata; protected KickstartIpRange ip1; commit 53f173d06ac00c41721bf059b5d76b2bb81d9950 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 16:45:53 2012 +0200 fix CryptoKeyCreateActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java index 821534b..ccdfa4c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/keys/test/CryptoKeyCreateActionTest.java @@ -19,14 +19,14 @@ import com.redhat.rhn.domain.kickstart.crypto.CryptoKey; import com.redhat.rhn.domain.kickstart.crypto.test.CryptoTest; import com.redhat.rhn.frontend.action.keys.CryptoKeyCreateAction; import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; /** * CryptoKeyCreateActionTest * @version $Rev: 1 $ */ -public class CryptoKeyCreateActionTest extends RhnMockStrutsTestCase { +public class CryptoKeyCreateActionTest extends RhnPostMockStrutsTestCase { public void setUp() throws Exception { TestUtils.disableLocalizationLogging(); commit e26fe4db823ea45e38e4de21ced0bfbb94690302 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 16:44:19 2012 +0200 fix CertificateConfigActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java index 82b3ba0..59a75ae 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/CertificateConfigActionTest.java @@ -18,7 +18,7 @@ import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.action.satellite.CertificateConfigAction; import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; import org.apache.struts.action.DynaActionForm; @@ -27,7 +27,7 @@ import org.apache.struts.action.DynaActionForm; * CertificateConfigActionTest * @version $Rev: 1 $ */ -public class CertificateConfigActionTest extends RhnMockStrutsTestCase { +public class CertificateConfigActionTest extends RhnPostMockStrutsTestCase { @Override public void setUp() throws Exception { commit 62ef5130770c69a4b721ed9be4b1f65aa8d9385f Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 16:43:01 2012 +0200 fix SystemDetailsEditActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java index f5b4e54..ec0c640 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java @@ -24,7 +24,7 @@ import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.testing.ChannelTestUtils; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.ServerTestUtils; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils; @@ -38,7 +38,7 @@ import java.util.List; * SystemDetailsEditActionTest * @version $Rev$ */ -public class SystemDetailsEditActionTest extends RhnMockStrutsTestCase { +public class SystemDetailsEditActionTest extends RhnPostMockStrutsTestCase { protected Server s; commit 39b258711c14860478ed507afc620975cb8330ec Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 16:40:40 2012 +0200 fix PreservationListEditActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java index 511b8df..9606dca 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListEditActionTest.java @@ -20,7 +20,7 @@ import com.redhat.rhn.domain.common.test.FileListTest; import com.redhat.rhn.frontend.action.systems.provisioning.BasePreservationListEditAction; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils; @@ -28,7 +28,7 @@ import com.redhat.rhn.testing.UserTestUtils; * PreservationListEditActionTest * @version $Rev: 1 $ */ -public class PreservationListEditActionTest extends RhnMockStrutsTestCase { +public class PreservationListEditActionTest extends RhnPostMockStrutsTestCase { public void testEditExecute() throws Exception { UserTestUtils.addProvisioning(user.getOrg()); commit b23ca87dccf91d1a762c866970d90aaafd9df3f1 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 16:37:40 2012 +0200 fix KickstartPartitionActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java index 104507c..9c5bfa9 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPartitionActionTest.java @@ -19,7 +19,7 @@ import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.frontend.action.kickstart.KickstartPartitionEditAction; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; import org.apache.struts.action.DynaActionForm; @@ -28,7 +28,7 @@ import org.apache.struts.action.DynaActionForm; * KickstartPreActionTest * @version $Rev: 1 $ */ -public class KickstartPartitionActionTest extends RhnMockStrutsTestCase { +public class KickstartPartitionActionTest extends RhnPostMockStrutsTestCase { private KickstartData ksdata; @Override commit 0cf98f16512048aaf38b9762fcf92cdd8a3e63e2 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 16:31:04 2012 +0200 fix CreateUserActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java index f2b4d7a..84a4a3d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/test/CreateUserActionTest.java @@ -18,7 +18,7 @@ import com.redhat.rhn.common.messaging.MessageQueue; import com.redhat.rhn.frontend.action.user.CreateUserAction; import com.redhat.rhn.frontend.action.user.UserActionHelper; import com.redhat.rhn.testing.RhnMockDynaActionForm; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.webapp.RhnServletListener; @@ -27,7 +27,7 @@ import com.redhat.rhn.webapp.RhnServletListener; * * @version $Rev: 1427 $ */ -public class CreateUserActionTest extends RhnMockStrutsTestCase { +public class CreateUserActionTest extends RhnPostMockStrutsTestCase { private static RhnServletListener rl; commit c764a6950f38227289c41d49fca2a63b7a3f399e Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 16:27:19 2012 +0200 fix CloneConfirmActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java index 43f4f78..e6ff304 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java @@ -27,7 +27,7 @@ import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.testing.RhnMockStrutsTestCase; +import com.redhat.rhn.testing.RhnPostMockStrutsTestCase; import java.util.ArrayList; import java.util.Iterator; @@ -37,7 +37,7 @@ import java.util.List; * CloneConfirmActionTest * @version $Rev$ */ -public class CloneConfirmActionTest extends RhnMockStrutsTestCase { +public class CloneConfirmActionTest extends RhnPostMockStrutsTestCase { public void setUp() throws Exception { super.setUp(); commit 9e2676465a8f20f382b5c50ebe613a6f89183031 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 16:26:23 2012 +0200 create RhnPostMockStrutsTestCase for testing POST methods diff --git a/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java b/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java new file mode 100644 index 0000000..bd17b33 --- /dev/null +++ b/java/code/src/com/redhat/rhn/testing/RhnPostMockStrutsTestCase.java @@ -0,0 +1,30 @@ +/** + * Copyright (c) 2011 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.testing; + +import servletunit.HttpServletRequestSimulator; + + +/** + * RhnPostMockStrutsTestCase + * @version $Rev$ + */ +public class RhnPostMockStrutsTestCase extends RhnMockStrutsTestCase { + + public void setUp() throws Exception { + super.setUp(); + request.setMethod(HttpServletRequestSimulator.POST); + } +} commit aa6744f6909c412a1004e1f00cad078a2880d2ff Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 16:03:31 2012 +0200 statements cannot end with ";" for Oracle diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java index 5935e21..d3ff272 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java +++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java @@ -382,6 +382,8 @@ public class AdvDataSourceTest extends RhnBaseTestCase { " id number" + " constraint adv_datasource_pk primary key" + ")"); + stmt.execute("insert into adv_datasource(foobar, id) " + + "values ('Blarg', 1)"); } else { c.rollback(); @@ -393,9 +395,9 @@ public class AdvDataSourceTest extends RhnBaseTestCase { " id numeric" + " constraint adv_datasource_pk primary key" + ");"); + stmt.execute("insert into adv_datasource(foobar, id) " + + "values ('Blarg', 1);"); } - stmt.execute("insert into adv_datasource(foobar, id) " + - "values ('Blarg', 1);"); c.commit(); } finally {

1 0

utils/sw-system-snapshot.sgml utils/systemSnapshot.py
by Milan Zazrivec 10 Apr '12

10 Apr '12

utils/sw-system-snapshot.sgml | 10 ++++++++++ utils/systemSnapshot.py | 41 +++++++++++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 8 deletions(-) New commits: commit aac94c5f5e777eb03f8dc43495ff520dace600f0 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Apr 10 17:16:43 2012 +0200 810313 - new option to list snapshot details diff --git a/utils/sw-system-snapshot.sgml b/utils/sw-system-snapshot.sgml index 805e2ff..b31d922 100644 --- a/utils/sw-system-snapshot.sgml +++ b/utils/sw-system-snapshot.sgml @@ -38,6 +38,10 @@ List or delete system snapshots from the management server. <arg>--list</arg> </cmdsynopsis> <cmdsynopsis> + <arg>-L</arg> + <arg>--long-list</arg> + </cmdsynopsis> + <cmdsynopsis> <arg>-d</arg> <arg>--delete</arg> </cmdsynopsis> @@ -107,6 +111,12 @@ List or delete system snapshots from the management server. </listitem> </varlistentry> <varlistentry> + <term>-L, --long-list</term> + <listitem> + <para>List details about system snapshots that meet the criteria provided.</para> + </listitem> + </varlistentry> + <varlistentry> <term>-d, --delete</term> <listitem> <para>Delete system snapshots that meet the criteria provided.</para> diff --git a/utils/systemSnapshot.py b/utils/systemSnapshot.py index 5b2cf78..849cf8c 100755 --- a/utils/systemSnapshot.py +++ b/utils/systemSnapshot.py @@ -37,6 +37,8 @@ options_table = [ help="Delete snapshots."), Option("-l", "--list", action="count", help="List snapshot summary."), + Option("-L", "--long-list", action="count", + help="Display comprehensive snapshot list."), Option("-a", "--all", action="count", help="Include all snapshots based on criteria provided."), Option("--start-date", action="store", @@ -127,7 +129,8 @@ def deleteAllBetweenDates(sessionKey, startDate, endDate): if options.list: listSnapshots(system.get('id'), snapshots) - + elif options.long_list: + listSnapshotsLong(system.get('id'), snapshots) else: client.system.provisioning.snapshot.deleteSnapshots(sessionKey, \ {"startDate":startDate, "endDate":endDate}) @@ -150,7 +153,8 @@ def deleteAllAfterDate(sessionKey, startDate): if options.list: listSnapshots(system.get('id'), snapshots) - + elif options.long_list: + listSnapshotsLong(system.get('id'), snapshots) else: client.system.provisioning.snapshot.deleteSnapshots(sessionKey, \ {"startDate":startDate}) @@ -172,7 +176,8 @@ def deleteAll(sessionKey): if options.list: listSnapshots(system.get('id'), snapshots) - + elif options.long_list: + listSnapshotsLong(system.get('id'), snapshots) else: client.system.provisioning.snapshot.deleteSnapshots(sessionKey, \ {}) @@ -196,7 +201,8 @@ def deleteBySystemBetweenDates(sessionKey, systemIds, startDate, endDate): if options.list: listSnapshots(systemId, snapshots) - + elif options.long_list: + listSnapshotsLong(systemId, snapshots) else: client.system.provisioning.snapshot.deleteSnapshots( \ sessionKey, systemId, \ @@ -224,7 +230,8 @@ def deleteBySystemAfterDate(sessionKey, systemIds, startDate): if options.list: listSnapshots(systemId, snapshots) - + elif options.long_list: + listSnapshotsLong(systemId, snapshots) else: client.system.provisioning.snapshot.deleteSnapshots( \ sessionKey, systemId, {"startDate":startDate}) @@ -250,7 +257,8 @@ def deleteBySystem(sessionKey, systemIds): if options.list: listSnapshots(systemId, snapshots) - + elif options.long_list: + listSnapshotsLong(systemId, snapshots) else: client.system.provisioning.snapshot.deleteSnapshots( \ sessionKey, systemId, {}) @@ -305,13 +313,26 @@ def listSnapshots(systemId, snapshots): print "systemId: %d, snapshots: %d, oldest: %s, newest: %s" \ % (systemId, len(snapshots), oldest, newest) + +def listSnapshotsLong(systemId, snapshots): + """ + List to stdout the comprehensive summaries of snapshots for the system provided. + """ + for snapshot in snapshots: + print "systemId: %d, snapshotId: %d, created: %s, reason: %s" % \ + (systemId, \ + snapshot['id'], \ + datetime(*(strptime(snapshot['created'].value, "%Y%m%dT%H:%M:%S")[0:6])), \ + snapshot['reason']) + + def processCommandLine(): if not options.satellite: options.satellite = os.uname()[1] - if not options.delete and not options.list: - sys.stderr.write("Must include a command options (--list, --delete)\n") + if not options.delete and not options.list and not options.long_list: + sys.stderr.write("Must include a command options (--list, --long-list, --delete)\n") sys.exit(1) if not options.all and not options.system_id and not options.snapshot_id: @@ -326,6 +347,10 @@ def processCommandLine(): sys.stderr.write("--end-date must be used with --start-date.\n") sys.exit(1) + if options.list and options.long_list: + sys.stderr.write("-l (--list) and -L (--long-list) are mutually exclusive.\n") + sys.exit(1) + # convert the start / end dates to a format that usable by the xmlrpc api if options.start_date: options.start_date = datetime(*(strptime(options.start_date, "%Y%m%d%H%M%S")[0:6]))

1 0

java/code schema/spacewalk
by Jan Pazdziora 10 Apr '12

10 Apr '12

java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml | 6 +++--- java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml | 4 ++-- schema/spacewalk/common/data/rhn_command.sql | 2 +- schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-rhn_command-check_log_size.sql | 3 +++ 18 files changed, 37 insertions(+), 34 deletions(-) New commits: commit ab041f279e3b44cacdc09338e4701110acfa9ee4 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 10 16:13:41 2012 +0200 787225 - the Log Size actually checks Log Size Growth. diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml index c519149..422cdd4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_bn_IN.xml @@ -3324,9 +3324,9 @@ <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> <target>Log Pattern Match</target></trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> - <target>Log Size</target></trans-unit> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> + <target>Log Size Growth</target></trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> <target>LongLegs</target></trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml index 063f9ad..4013924 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_de.xml @@ -3324,8 +3324,8 @@ <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> <target>Log Pattern Match</target></trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> <target>Log-Größe</target></trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml index 51ad1b2..019fca4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_en_US.xml @@ -3344,8 +3344,8 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> </trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> </trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml index 2a2f5c6..0b2e73c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_es.xml @@ -3324,8 +3324,8 @@ <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> <target>Coincidencias de patrones de registro</target></trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> <target>Tamaño del registro</target></trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml index 0021c00..07da9e0 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_fr.xml @@ -3324,8 +3324,8 @@ <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> <target>Correspondances de modèles de journaux</target></trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> <target>Taille de journal</target></trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml index 59536d5..d9c389a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_gu.xml @@ -3324,8 +3324,8 @@ <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> <target>લોગ ભાત જોડણીઓ</target></trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> <target>લોગ માપ</target></trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml index 40927c8..02ab229 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_hi.xml @@ -3324,8 +3324,8 @@ <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> <target>लॉग प्रारूप मेल</target></trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> <target>लॉग आकार</target></trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml index ec6a763..32040ab 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_it.xml @@ -3324,8 +3324,8 @@ <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> <target>Corrispondenze del Pattern di log</target></trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> <target>Misura del Log</target></trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml index b7285fe..4de7427 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ja.xml @@ -3324,8 +3324,8 @@ <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> <target>ログパターン一致</target></trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> <target>ログサイズ</target></trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml index d1782a7..c7e2436 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ko.xml @@ -3324,8 +3324,8 @@ <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> <target>로그 패턴 일치</target></trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> <target>로그 크기</target></trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml index 1edbf86..8ad736d 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pa.xml @@ -3324,8 +3324,8 @@ <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> <target>ਲਾਗ ਪੈਟਰਨ ਮੇਲ</target></trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> <target>ਲਾਗ ਅਕਾਰ</target></trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml index c450046..1569946 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_pt_BR.xml @@ -3324,8 +3324,8 @@ <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> <target>Ocorrências do Modelo de Registro</target></trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> <target>Tamanho do Registro</target></trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml index 5a4ddd5..ff7c2da 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ru.xml @@ -3324,8 +3324,8 @@ <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> <target>Соответствие шаблона журналирования</target></trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> <target>Размер журнала</target></trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml index e45aaf2..09fecb3 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_ta.xml @@ -3324,8 +3324,8 @@ <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> <target>பதிவு வடிவ ஒப்பீடு</target></trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> <target>பதிவு அளவு</target></trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml index 8d41c27..b7cd1ee 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_CN.xml @@ -3324,8 +3324,8 @@ <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> <target>日志特征匹配</target></trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> <target>日志大小</target></trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml index 606cbcc..46ecafe 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_zh_TW.xml @@ -3324,8 +3324,8 @@ <trans-unit id="Log Pattern Match"> <source>Log Pattern Match</source> <target>紀錄模式吻合</target></trans-unit> - <trans-unit id="Log Size"> - <source>Log Size</source> + <trans-unit id="Log Size Growth"> + <source>Log Size Growth</source> <target>紀錄檔大小</target></trans-unit> <trans-unit id="LongLegs"> <source>LongLegs</source> diff --git a/schema/spacewalk/common/data/rhn_command.sql b/schema/spacewalk/common/data/rhn_command.sql index c6706bd..8647420 100644 --- a/schema/spacewalk/common/data/rhn_command.sql +++ b/schema/spacewalk/common/data/rhn_command.sql @@ -264,7 +264,7 @@ command_class,enabled,for_host_probe,last_update_user,last_update_date,system_re insert into rhn_command(recid,name,description,group_name,allowed_in_suite, command_class,enabled,for_host_probe,last_update_user,last_update_date,system_requirements,version_support,help_url) values ( -106,'check_log_size','Log Size','logagent','1','LogAgent::Size','1','0','system',current_timestamp,'npunix',NULL,'/help/userguides/user_guide_v2/Output/LogAgentCheck.html#LogSize'); +106,'check_log_size','Log Size Growth','logagent','1','LogAgent::Size','1','0','system',current_timestamp,'npunix',NULL,'/help/userguides/user_guide_v2/Output/LogAgentCheck.html#LogSize'); insert into rhn_command(recid,name,description,group_name,allowed_in_suite, command_class,enabled,for_host_probe,last_update_user,last_update_date,system_requirements,version_support,help_url) diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-rhn_command-check_log_size.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-rhn_command-check_log_size.sql new file mode 100644 index 0000000..c83b437 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-rhn_command-check_log_size.sql @@ -0,0 +1,3 @@ + +update rhn_command set description = 'Log Size Growth' where name = 'check_log_size' ; +

1 0

Changes to 'refs/tags/osad-5.10.44-1'
by Milan Zazrivec 10 Apr '12

10 Apr '12

Tag 'osad-5.10.44-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2012-04-10 13:41 +0000 Tagging package [osad] version [5.10.44-1] in directory [client/tools/osad/]. Changes since spacewalk-java-1.8.39-1: Milan Zazrivec (2): 716064 - prevent 'notifying clients' starvation Automatic commit of package [osad] release [5.10.44-1]. --- client/tools/osad/osad.spec | 5 ++++- client/tools/osad/src/osa_dispatcher.py | 4 ++-- rel-eng/packages/osad | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) ---

1 0

client/tools rel-eng/packages
by Milan Zazrivec 10 Apr '12

10 Apr '12

client/tools/osad/osad.spec | 5 ++++- rel-eng/packages/osad | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit de0cc1d652e30fba0e9688eb1b916d540249a494 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Apr 10 15:41:08 2012 +0200 Automatic commit of package [osad] release [5.10.44-1]. diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index fae875a..6028805 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -16,7 +16,7 @@ Group: System Environment/Daemons License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 5.10.43 +Version: 5.10.44 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -278,6 +278,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {} %endif %changelog +* Tue Apr 10 2012 Milan Zazrivec <mzazrivec(a)redhat.com> 5.10.44-1 +- 716064 - prevent 'notifying clients' starvation + * Mon Apr 09 2012 Stephen Herr <sherr(a)redhat.com> 5.10.43-1 - 810908 - Make osa-dispatcher use the hostname in the rhn.conf if present (sherr(a)redhat.com) diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index b92821a..f212306 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.10.43-1 client/tools/osad/ +5.10.44-1 client/tools/osad/

1 0

client/tools
by Milan Zazrivec 10 Apr '12

10 Apr '12

client/tools/osad/src/osa_dispatcher.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c55818af8d22109b7e9d1310d694cae1561e0e41 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Apr 10 15:34:16 2012 +0200 716064 - prevent 'notifying clients' starvation Previously, in a single loop pass, we only notified clients if there was no more data to read from clients: if (there_is_client_data_to_read): read_the_client_data() else: push_scheduled_actions_to_clients() This schema would allow for starvation of the else branch. All you needed for the starvation was a data to be read from clients, since it would always be prefered to the event pushing. We want to prevent the starvation using the following logic: if (there_is_client_data_to_read): read_the_client_data() if (the_client_socket_is_write_ready): push_scheduled_actions_to_clients() diff --git a/client/tools/osad/src/osa_dispatcher.py b/client/tools/osad/src/osa_dispatcher.py index 2071672..a5a1e6c 100644 --- a/client/tools/osad/src/osa_dispatcher.py +++ b/client/tools/osad/src/osa_dispatcher.py @@ -187,7 +187,7 @@ class Runner(jabber_lib.Runner): client.ping_clients(need_pinging) npi = self._next_poll_interval - rfds, wfds, efds = select.select([client, self._tcp_server], [], [], npi) + rfds, wfds, efds = select.select([client, self._tcp_server], [client], [], npi) # Reset the next poll interval npi = self._next_poll_interval = self._poll_interval if client in rfds: @@ -198,7 +198,7 @@ class Runner(jabber_lib.Runner): # we were tickled self._tcp_server.handle_request() npi = self._tcp_server.get_next_poll_interval() or self._poll_interval - if not rfds: + if wfds: # Timeout log_debug(5,"Notifying jabber nodes") self._tcp_server.notify_jabber_nodes()

1 0

Changes to 'refs/tags/spacewalk-java-1.8.39-1'
by Tomas Lestach 10 Apr '12

10 Apr '12

Tag 'spacewalk-java-1.8.39-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-04-10 12:57 +0000 Tagging package [spacewalk-java] version [1.8.39-1] in directory [java/]. Changes since oracle-xe-selinux-10.2.0.24-1: Tomas Lestach (18): fix ProvisionVirtualizationWizardActionTest.testStepOne removing unnecessary else statement removing unnecessary casts refactor how PackageEvr gets stored fix CobblerCommandTest fix AdvDataSourceTest suite part run oracle specific tests only with oracle DB fix SessionCancelActionTest fix TraceBackEventTest fix ActivationKeyTest.testDuplicateKeyCreation check whether it's a trusted org before accessing its attributes fix org.trusts.getDetails API fix PG lookup_transaction_package stored procedure fix ProfileManagerTest tests - set user's org to the channel created by him fix ServerConfigHandlerTest.createRevision fix ServerConfigHandlerTest revision comparism Automatic commit of package [spacewalk-java] release [1.8.39-1]. --- java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java | 184 +++++----- java/code/src/com/redhat/rhn/domain/action/ActionFactory.java | 2 java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java | 2 java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java | 2 java/code/src/com/redhat/rhn/domain/org/OrgFactory.java | 8 java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java | 34 + java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrFactoryTest.java | 2 java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java | 2 java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java | 2 java/code/src/com/redhat/rhn/domain/server/ServerFactory.java | 2 java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java | 13 java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgTrustDetailsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/test/SessionCancelActionTest.java | 3 java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java | 2 java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java | 8 java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java | 7 java/code/src/com/redhat/rhn/manager/audit/ScapManager.java | 4 java/code/src/com/redhat/rhn/manager/errata/cache/test/ErrataCacheManagerTest.java | 4 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java | 4 java/code/src/com/redhat/rhn/manager/org/OrgManager.java | 20 - java/code/src/com/redhat/rhn/manager/profile/test/ProfileManagerTest.java | 5 java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java | 2 java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 2 java/code/src/com/redhat/rhn/testing/ServerTestUtils.java | 3 java/spacewalk-java.spec | 21 + rel-eng/packages/spacewalk-java | 2 schema/spacewalk/postgres/procs/lookup_transaction_package.sql | 2 schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.oracle | 1 schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.postgresql | 80 ++++ 32 files changed, 295 insertions(+), 138 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 10 Apr '12

10 Apr '12

java/spacewalk-java.spec | 21 ++++++++++++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) New commits: commit ca1b04dde4ae63779c4dc7a7d0e0c0a4e8170ab8 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Apr 10 14:57:29 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.39-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 62359bc..a1d852b 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.38 +Version: 1.8.39 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,25 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Apr 10 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.39-1 +- fix ServerConfigHandlerTest revision comparism (tlestach(a)redhat.com) +- fix ServerConfigHandlerTest.createRevision (tlestach(a)redhat.com) +- tests - set user's org to the channel created by him (tlestach(a)redhat.com) +- fix ProfileManagerTest (tlestach(a)redhat.com) +- fix org.trusts.getDetails API (tlestach(a)redhat.com) +- check whether it's a trusted org before accessing its attributes + (tlestach(a)redhat.com) +- fix ActivationKeyTest.testDuplicateKeyCreation (tlestach(a)redhat.com) +- fix TraceBackEventTest (tlestach(a)redhat.com) +- fix SessionCancelActionTest (tlestach(a)redhat.com) +- run oracle specific tests only with oracle DB (tlestach(a)redhat.com) +- fix AdvDataSourceTest suite part (tlestach(a)redhat.com) +- fix CobblerCommandTest (tlestach(a)redhat.com) +- refactor how PackageEvr gets stored (tlestach(a)redhat.com) +- removing unnecessary casts (tlestach(a)redhat.com) +- removing unnecessary else statement (tlestach(a)redhat.com) +- fix ProvisionVirtualizationWizardActionTest.testStepOne (tlestach(a)redhat.com) + * Tue Apr 10 2012 Jan Pazdziora 1.8.38-1 - OpenSCAP integration -- view latest results of whole infrastructure (slukasik(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 8ce821e..11a2815 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.38-1 java/ +1.8.39-1 java/

1 0

17 commits - java/code schema/spacewalk
by Tomas Lestach 10 Apr '12

10 Apr '12

java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java | 184 +++++----- java/code/src/com/redhat/rhn/domain/action/ActionFactory.java | 2 java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java | 2 java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java | 2 java/code/src/com/redhat/rhn/domain/org/OrgFactory.java | 8 java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java | 34 + java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrFactoryTest.java | 2 java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java | 2 java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java | 2 java/code/src/com/redhat/rhn/domain/server/ServerFactory.java | 2 java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java | 13 java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgTrustDetailsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/test/SessionCancelActionTest.java | 3 java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java | 2 java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java | 8 java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java | 7 java/code/src/com/redhat/rhn/manager/audit/ScapManager.java | 4 java/code/src/com/redhat/rhn/manager/errata/cache/test/ErrataCacheManagerTest.java | 4 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java | 4 java/code/src/com/redhat/rhn/manager/org/OrgManager.java | 20 - java/code/src/com/redhat/rhn/manager/profile/test/ProfileManagerTest.java | 5 java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java | 2 java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 2 java/code/src/com/redhat/rhn/testing/ServerTestUtils.java | 3 schema/spacewalk/postgres/procs/lookup_transaction_package.sql | 2 schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.oracle | 1 schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.postgresql | 80 ++++ 30 files changed, 274 insertions(+), 136 deletions(-) New commits: commit ecb8ebef9c8bf6756917583120a0603728b2cb3c Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 6 16:36:35 2012 +0200 fix ServerConfigHandlerTest revision comparism diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java index 84b0fe4..e3482a6 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java @@ -277,9 +277,8 @@ public class ServerConfigHandlerTest extends BaseHandlerTestCase { boolean lookLocal) { List<String> paths = new ArrayList<String>(1); paths.add(path); - assertEquals(rev, handler.lookupFileInfo(adminKey, - server.getId().intValue(), - paths, lookLocal).get(0)); + assertTrue(rev.matches(handler.lookupFileInfo(adminKey, server.getId().intValue(), + paths, lookLocal).get(0))); } public void testLookupFileInfoNoData() throws Exception { commit 473f303f6162451422f4a10554af6485b5ad559d Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 6 16:36:13 2012 +0200 fix ServerConfigHandlerTest.createRevision diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java index cec652a..84b0fe4 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java @@ -197,7 +197,6 @@ public class ServerConfigHandlerTest extends BaseHandlerTestCase { Server server, boolean commitToLocal, String selinuxCtx) throws ValidatorException { Map <String, Object> data = new HashMap<String, Object>(); - data.put("contents", contents); data.put(ConfigRevisionSerializer.GROUP, group); data.put(ConfigRevisionSerializer.OWNER, owner); data.put(ConfigRevisionSerializer.PERMISSIONS, perms); @@ -205,6 +204,7 @@ public class ServerConfigHandlerTest extends BaseHandlerTestCase { String start = "#@"; String end = "@#"; if (!isDir) { + data.put(ConfigRevisionSerializer.CONTENTS, contents); data.put(ConfigRevisionSerializer.MACRO_START, start); data.put(ConfigRevisionSerializer.MACRO_END, end); } commit d018e99c137388f3bcd9072586e52da5b682d56a Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 6 16:17:35 2012 +0200 tests - set user's org to the channel created by him diff --git a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java index 98524bc..b0f195f 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFactoryTest.java @@ -80,7 +80,7 @@ public class ChannelFactoryTest extends RhnBaseTestCase { public static Channel createBaseChannel(User user) throws Exception { Channel c = createTestChannel(user); - c.setOrg(null); + c.setOrg(user.getOrg()); ProductName pn = lookupOrCreateProductName(ChannelManager.RHEL_PRODUCT_NAME); c.setProductName(pn); commit 1d000e6df1af8c8fc1ff9b8b9b4807129e70d064 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 6 15:43:38 2012 +0200 fix ProfileManagerTest diff --git a/java/code/src/com/redhat/rhn/manager/profile/test/ProfileManagerTest.java b/java/code/src/com/redhat/rhn/manager/profile/test/ProfileManagerTest.java index a0526c9..93b51d5 100644 --- a/java/code/src/com/redhat/rhn/manager/profile/test/ProfileManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/profile/test/ProfileManagerTest.java @@ -21,6 +21,8 @@ import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.channel.NoBaseChannelFoundException; import com.redhat.rhn.domain.channel.test.ChannelFactoryTest; import com.redhat.rhn.domain.rhnpackage.Package; +import com.redhat.rhn.domain.rhnpackage.PackageArch; +import com.redhat.rhn.domain.rhnpackage.PackageFactory; import com.redhat.rhn.domain.rhnpackage.profile.Profile; import com.redhat.rhn.domain.rhnpackage.test.PackageTest; import com.redhat.rhn.domain.rhnset.RhnSet; @@ -439,6 +441,9 @@ public class ProfileManagerTest extends RhnBaseTestCase { pli.setIdCombo(nameId + "|" + evrString.hashCode()); pli.setEvr(evrString); pli.setNameId(new Long(nameId)); + PackageArch pa = PackageFactory.lookupPackageArchByLabel("x86_64"); + pli.setArch(pa.getLabel()); + pli.setArchId(pa.getId()); return pli; } commit 7d5b103704271058cef3ec9c605f3daee85fa6bc Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 6 15:43:24 2012 +0200 fix PG lookup_transaction_package stored procedure causes syntax errors diff --git a/schema/spacewalk/postgres/procs/lookup_transaction_package.sql b/schema/spacewalk/postgres/procs/lookup_transaction_package.sql index 599d209..f07a703 100644 --- a/schema/spacewalk/postgres/procs/lookup_transaction_package.sql +++ b/schema/spacewalk/postgres/procs/lookup_transaction_package.sql @@ -62,7 +62,7 @@ begin perform pg_dblink_exec( 'insert into rhnTransactionPackage (id, operation, name_id, evr_id, package_arch_id)' || ' values (' || tp_id || ', ' || o_id || ', ' || n_id || ', ' || e_id || - ', ' || ', ' || p_arch_id || ')'); + ', ' || p_arch_id || ')'); exception when unique_violation then select id into strict tp_id diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.oracle new file mode 100644 index 0000000..cf2393b --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.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/021-lookup_transaction_package.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.postgresql new file mode 100644 index 0000000..e498de2 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/021-lookup_transaction_package.sql.postgresql @@ -0,0 +1,80 @@ +-- oracle equivalent source sha1 b04dab2ff31049a8744e5ce1531ccd8b00152bbc +-- +-- Copyright (c) 2008--2012 Red Hat, Inc. +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- Red Hat trademarks are not licensed under GPLv2. No permission is +-- granted to use or replicate Red Hat trademarks that are incorporated +-- in this software or its documentation. + +create or replace function +lookup_transaction_package( + o_in in varchar, + n_in in varchar, + e_in in varchar, + v_in in varchar, + r_in in varchar, + a_in in varchar) +returns numeric +as +$$ +declare + o_id numeric; + n_id numeric; + e_id numeric; + p_arch_id numeric; + tp_id numeric; +begin + select id + into o_id + from rhnTransactionOperation + where label = o_in; + + if not found then + perform rhn_exception.raise_exception('invalid_transaction_operation'); + end if; + + n_id := lookup_package_name(n_in); + e_id := lookup_evr(e_in, v_in, r_in); + p_arch_id := null; + + if a_in is not null then + p_arch_id := lookup_package_arch(a_in); + end if; + + select id + into tp_id + from rhnTransactionPackage + where operation = o_id and + name_id = n_id and + evr_id = e_id and + (package_arch_id = p_arch_id or (p_arch_id is null and package_arch_id is null)); + + if not found then + tp_id := nextval('rhn_transpack_id_seq'); + begin + perform pg_dblink_exec( + 'insert into rhnTransactionPackage (id, operation, name_id, evr_id, package_arch_id)' || + ' values (' || tp_id || ', ' || o_id || ', ' || n_id || ', ' || e_id || + ', ' || p_arch_id || ')'); + exception when unique_violation then + select id + into strict tp_id + from rhnTransactionPackage + where operation = o_id and + name_id = n_id and + evr_id = e_id and + (package_arch_id = p_arch_id or (p_arch_id is null and package_arch_id is null)); + end; + end if; + + return tp_id; +end; +$$ +language plpgsql immutable; commit 8fdcf1790c9f2a2110ded070b40d158111c5d6b0 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 6 14:27:39 2012 +0200 fix org.trusts.getDetails API and appropriate test diff --git a/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java b/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java index 9d78de8..19ff56c 100644 --- a/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java +++ b/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java @@ -19,7 +19,6 @@ import com.redhat.rhn.common.db.datasource.DataList; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.common.hibernate.HibernateFactory; -import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.channel.ChannelFamily; import com.redhat.rhn.domain.role.RoleFactory; @@ -417,15 +416,14 @@ public class OrgFactory extends HibernateFactory { /** * @param org Our org * @param trustedOrg the org we trust - * @return Formated created String for Trusted Org + * @return date created for Trusted Org */ - public static String getTrustedSince(Long org, Long trustedOrg) { + public static Date getTrustedSince(Long org, Long trustedOrg) { Map<String, Object> params = new HashMap<String, Object>(); params.put("org_id", org); params.put("trusted_org_id", trustedOrg); - Date date = (Date)singleton.lookupObjectByNamedQuery( + return (Date)singleton.lookupObjectByNamedQuery( "Org.getTrustedSince", params); - return LocalizationService.getInstance().formatDate(date); } /** diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgTrustDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgTrustDetailsAction.java index 5035157..9a79778 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgTrustDetailsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgTrustDetailsAction.java @@ -53,7 +53,7 @@ public class OrgTrustDetailsAction extends RhnAction { String created = LocalizationService.getInstance() .formatDate(trustOrg.getCreated()); - String since = OrgManager.getTrustedSince(user, org, trustOrg); + String since = OrgManager.getTrustedSinceString(user, org, trustOrg); request.setAttribute("orgtrust", trustOrg.getName()); request.setAttribute("created", created); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java index c3b7dcb..8eab378 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java @@ -202,10 +202,9 @@ public class OrgTrustHandler extends BaseHandler { details.put("created", trustOrg.getCreated()); } - String since = OrgManager.getTrustedSince(user, user.getOrg(), trustOrg); + Date since = OrgManager.getTrustedSince(user, user.getOrg(), trustOrg); if (since != null) { - Date dateSince = new Date(since); - details.put("trusted_since", dateSince); + details.put("trusted_since", since); } details.put("channels_provided", OrgManager.getSharedChannels(user, trustOrg, user.getOrg())); diff --git a/java/code/src/com/redhat/rhn/manager/org/OrgManager.java b/java/code/src/com/redhat/rhn/manager/org/OrgManager.java index 52f34c1..c06d8da 100644 --- a/java/code/src/com/redhat/rhn/manager/org/OrgManager.java +++ b/java/code/src/com/redhat/rhn/manager/org/OrgManager.java @@ -38,6 +38,7 @@ import com.redhat.rhn.manager.entitlement.EntitlementManager; import java.util.Collections; import java.util.Comparator; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -334,9 +335,9 @@ public class OrgManager extends BaseManager { * @param user currently logged in user * @param org our org * @param trustOrg the org we trust - * @return String representing date we started trusting this org + * @return date we started trusting this org */ - public static String getTrustedSince(User user, Org org, Org trustOrg) { + public static Date getTrustedSince(User user, Org org, Org trustOrg) { if (!user.hasRole(RoleFactory.ORG_ADMIN)) { // Throw an exception w/error msg so the user knows what went wrong. LocalizationService ls = LocalizationService.getInstance(); @@ -353,6 +354,21 @@ public class OrgManager extends BaseManager { /** * Returns the date which this org trusted the supplied orgId * @param user currently logged in user + * @param org our org + * @param trustOrg the org we trust + * @return String representing date we started trusting this org + */ + public static String getTrustedSinceString(User user, Org org, Org trustOrg) { + Date since = getTrustedSince(user, org, trustOrg); + if (since == null) { + return null; + } + return LocalizationService.getInstance().formatDate(since); + } + + /** + * Returns the date which this org trusted the supplied orgId + * @param user currently logged in user * @param orgTo Org to calculate the number of System migrations to * @param orgFrom Org to calculate the number of System migrations from * @return number of systems migrated to OrgIn commit b1fcf685e6307e667a3c91e63172d611d69668d7 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 6 14:20:19 2012 +0200 check whether it's a trusted org before accessing its attributes diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java index 5687288..c3b7dcb 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java @@ -192,6 +192,9 @@ public class OrgTrustHandler extends BaseHandler { if (trustOrg == null) { throw new NoSuchOrgException(trustOrgId.toString()); } + if (!user.getOrg().getTrustedOrgs().contains(trustOrg)) { + throw new OrgNotInTrustException(trustOrgId); + } Map<String, Object> details = new HashMap<String, Object>(); commit 02a7282c4477fe07e5e2a103f7fc0742a93e1f08 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 6 13:22:13 2012 +0200 fix ActivationKeyTest.testDuplicateKeyCreation diff --git a/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java b/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java index c624955..742696f 100644 --- a/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java +++ b/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.domain.token.test; +import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.test.ChannelFactoryTest; @@ -39,8 +40,6 @@ import com.redhat.rhn.testing.ServerGroupTestUtils; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils; -import org.hibernate.NonUniqueObjectException; - import java.util.List; /** @@ -234,8 +233,14 @@ public class ActivationKeyTest extends BaseTestCaseWithUser { String msg = "Duplicate Key exception not raised.."; fail(msg); } - catch (NonUniqueObjectException e) { - //sweet duplicate object exception + catch (ValidatorException e) { + for (ValidatorError er : e.getResult().getErrors()) { + if (er.getKey().equals("activation-key.java.exists")) { + // sweet duplicate object exception + return; + } + } + throw e; } } } commit 92b182678dfce7d46d3a3858c34d0c96f8b2eb86 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 6 12:03:29 2012 +0200 fix TraceBackEventTest diff --git a/java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java b/java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java index b90e3f7..6017d14 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java +++ b/java/code/src/com/redhat/rhn/frontend/events/TraceBackEvent.java @@ -51,7 +51,7 @@ public class TraceBackEvent extends BaseEvent implements EventMessage { if (request != null) { out.println(ls.getMessage("traceback message header")); out.print(request.getMethod()); - out.println(" " + request.getAttribute("requestedUri")); + out.println(" " + request.getRequestURI()); out.println(); out.print(ls.getMessage("date", getUserLocale())); out.print(":"); commit 46c4b3f8c728f5c8fdce2a02d196a4459ea33066 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 6 11:19:22 2012 +0200 fix SessionCancelActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/test/SessionCancelActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/test/SessionCancelActionTest.java index 64cd0cd..6e50953 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/test/SessionCancelActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/test/SessionCancelActionTest.java @@ -17,6 +17,8 @@ package com.redhat.rhn.frontend.action.systems.provisioning.kickstart.test; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; +import servletunit.HttpServletRequestSimulator; + /** * SessionCancelActionTest * @version $Rev: 1 $ @@ -33,6 +35,7 @@ public class SessionCancelActionTest extends BaseSessionTestCase { public void testExecuteSubmit() { addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString()); setRequestPathInfo("/systems/details/kickstart/SessionCancel"); + request.setMethod(HttpServletRequestSimulator.POST); actionPerform(); verifyActionMessage("kickstart.session_cancel.success"); assertEquals("/systems/details/kickstart/SessionStatus.do?sid=" + s.getId(), commit 9fb4ad2b137080cd22bb857ac0bd6371394d2424 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 6 10:41:13 2012 +0200 run oracle specific tests only with oracle DB diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java index afd615e..5935e21 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java +++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java @@ -87,75 +87,81 @@ public class AdvDataSourceTest extends RhnBaseTestCase { * Test for ModeFactory.getMode methods */ public void testDate() { - SelectMode m = ModeFactory.getMode("test_queries", "date_dto_test"); - DataResult dr = m.execute(new HashMap()); - assertTrue(dr.get(0) instanceof TestDateDto); - TestDateDto d = (TestDateDto) dr.get(0); - assertTrue(d.getCreated() instanceof Timestamp); + if (ConfigDefaults.get().isOracle()) { + SelectMode m = ModeFactory.getMode("test_queries", "date_dto_test"); + DataResult dr = m.execute(new HashMap()); + assertTrue(dr.get(0) instanceof TestDateDto); + TestDateDto d = (TestDateDto) dr.get(0); + assertTrue(d.getCreated() instanceof Timestamp); + } } public void testMaxRows() { - SelectMode m = ModeFactory.getMode("test_queries", "withClass"); - try { - m.setMaxRows(-10); - fail("setMaxRows should NOT allow negative numbers."); - } - catch (IllegalArgumentException e) { - // expected. + if (ConfigDefaults.get().isOracle()) { + SelectMode m = ModeFactory.getMode("test_queries", "withClass"); + try { + m.setMaxRows(-10); + fail("setMaxRows should NOT allow negative numbers."); + } + catch (IllegalArgumentException e) { + // expected. + } + m.setMaxRows(10); + Map params = null; + DataResult dr = m.execute(params); + assertNotNull(dr); + assertTrue(dr.size() == 10); } - m.setMaxRows(10); - Map params = null; - DataResult dr = m.execute(params); - assertNotNull(dr); - assertTrue(dr.size() == 10); } /** * Test for ModeFactory.getMode methods */ public void testModes() { - SelectMode m = ModeFactory.getMode("test_queries", "withClass"); - Map params = null; - DataResult dr = m.execute(params); - assertNotNull(dr); - assertTrue(dr.size() > 1); - Object obj = dr.iterator().next(); - /* The withClass query in test_queries should have a class defined. We don't really - * care what it is as long as it isn't a Map. - */ - assertTrue(!obj.getClass().getName().equals("java.util.Map")); - - //Try over-riding and getting a Map back - SelectMode m2 = ModeFactory.getMode("test_queries", "withClass", Map.class); - dr = m2.execute(params); - assertNotNull(dr); - assertTrue(dr.size() > 1); - obj = dr.iterator().next(); - //make sure we got some sort of a Map back - assertEquals("java.util.HashMap", obj.getClass().getName()); + if (ConfigDefaults.get().isOracle()) { + SelectMode m = ModeFactory.getMode("test_queries", "withClass"); + Map params = null; + DataResult dr = m.execute(params); + assertNotNull(dr); + assertTrue(dr.size() > 1); + Object obj = dr.iterator().next(); + /* The withClass query in test_queries should have a class defined. We don't + * really care what it is as long as it isn't a Map. + */ + assertTrue(!obj.getClass().getName().equals("java.util.Map")); + + //Try over-riding and getting a Map back + SelectMode m2 = ModeFactory.getMode("test_queries", "withClass", Map.class); + dr = m2.execute(params); + assertNotNull(dr); + assertTrue(dr.size() > 1); + obj = dr.iterator().next(); + //make sure we got some sort of a Map back + assertEquals("java.util.HashMap", obj.getClass().getName()); + + //Try over-riding with something incompatible + SelectMode m3 = ModeFactory.getMode("test_queries", "withClass", Set.class); + try { + dr = m3.execute(params); + fail(); + } + catch (ObjectCreateWrapperException e) { + //success! + } - //Try over-riding with something incompatible - SelectMode m3 = ModeFactory.getMode("test_queries", "withClass", Set.class); - try { - dr = m3.execute(params); - fail(); - } - catch (ObjectCreateWrapperException e) { - //success! + //Make sure our selectMode object was a copy and not the one cached + SelectMode m2a = ModeFactory.getMode("test_queries", "withClass"); + assertFalse(m2a.getClassString().equals("java.util.Set")); + assertFalse(m2a.getClassString().equals("java.util.Map")); + + //finally, make sure that by default our DataResult objects contain Maps + SelectMode m4 = ModeFactory.getMode("test_queries", "all_tables"); + dr = m4.execute(params); + assertNotNull(dr); + assertTrue(dr.size() > 1); + obj = dr.iterator().next(); + assertEquals("java.util.HashMap", obj.getClass().getName()); } - - //Make sure our selectMode object was a copy and not the one cached - SelectMode m2a = ModeFactory.getMode("test_queries", "withClass"); - assertFalse(m2a.getClassString().equals("java.util.Set")); - assertFalse(m2a.getClassString().equals("java.util.Map")); - - //finally, make sure that by default our DataResult objects contain Maps - SelectMode m4 = ModeFactory.getMode("test_queries", "all_tables"); - dr = m4.execute(params); - assertNotNull(dr); - assertTrue(dr.size() > 1); - obj = dr.iterator().next(); - assertEquals("java.util.HashMap", obj.getClass().getName()); } public void testInsert() throws Exception { @@ -287,21 +293,23 @@ public class AdvDataSourceTest extends RhnBaseTestCase { } public void testDoubleElaboration() throws Exception { - SelectMode m = ModeFactory.getMode("test_queries", "withClass"); - DataResult<TableData> dr = m.execute(Collections.EMPTY_MAP); - assertTrue(dr.size() >= 1); - dr.elaborate(); - TableData rowA = dr.get(0); - String tableNameA = rowA.getTableName(); - String columnNameA = StringUtils.join(rowA.getColumnName().iterator(), ","); - // Elaborate 2nd time - dr.elaborate(); - TableData rowB = dr.get(0); - String tableNameB = rowB.getTableName(); - String columnNameB = StringUtils.join(rowB.getColumnName().iterator(), ","); - - assertEquals(tableNameA, tableNameB); - assertEquals(columnNameA, columnNameB); + if (ConfigDefaults.get().isOracle()) { + SelectMode m = ModeFactory.getMode("test_queries", "withClass"); + DataResult<TableData> dr = m.execute(Collections.EMPTY_MAP); + assertTrue(dr.size() >= 1); + dr.elaborate(); + TableData rowA = dr.get(0); + String tableNameA = rowA.getTableName(); + String columnNameA = StringUtils.join(rowA.getColumnName().iterator(), ","); + // Elaborate 2nd time + dr.elaborate(); + TableData rowB = dr.get(0); + String tableNameB = rowB.getTableName(); + String columnNameB = StringUtils.join(rowB.getColumnName().iterator(), ","); + + assertEquals(tableNameA, tableNameB); + assertEquals(columnNameA, columnNameB); + } } public void testMaxRowsWithElaboration() throws Exception { commit aed68551c80c4a3b720c61095f34a3be22a8c217 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Apr 6 10:10:54 2012 +0200 fix AdvDataSourceTest suite part diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java index 84c4db9..afd615e 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java +++ b/java/code/src/com/redhat/rhn/common/db/datasource/test/AdvDataSourceTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.common.db.datasource.test; import com.redhat.rhn.common.ObjectCreateWrapperException; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.CallableMode; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; @@ -364,16 +365,29 @@ public class AdvDataSourceTest extends RhnBaseTestCase { } catch (SQLException e) { // Couldn't select 1, so the table didn't exist, create it - stmt.execute("create table adv_datasource " + - "( " + - " foobar VarChar2(32)," + - " test_column VarChar2(25)," + - " pin number, " + - " id number" + - " constraint adv_datasource_pk primary key" + - ")"); + if (ConfigDefaults.get().isOracle()) { + stmt.execute("create table adv_datasource " + + "( " + + " foobar VarChar2(32)," + + " test_column VarChar2(25)," + + " pin number, " + + " id number" + + " constraint adv_datasource_pk primary key" + + ")"); + } + else { + c.rollback(); + stmt.execute("create table adv_datasource " + + "( " + + " foobar VarChar," + + " test_column VarChar," + + " pin numeric, " + + " id numeric" + + " constraint adv_datasource_pk primary key" + + ");"); + } stmt.execute("insert into adv_datasource(foobar, id) " + - "values ('Blarg', 1)"); + "values ('Blarg', 1);"); c.commit(); } finally { commit 29c3067825890dc6097fce8bb83dce3ce0f28129 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Apr 5 17:11:02 2012 +0200 fix CobblerCommandTest diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java index 52c72f5..1af5e11 100755 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java @@ -16,6 +16,7 @@ package com.redhat.rhn.manager.kickstart.cobbler.test; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; +import com.redhat.rhn.domain.kickstart.test.KickstartableTreeTest; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.NetworkInterface; import com.redhat.rhn.domain.server.Server; @@ -49,7 +50,7 @@ public class CobblerCommandTest extends BaseTestCaseWithUser { user = UserTestUtils.createUserInOrgOne(); user.addRole(RoleFactory.ORG_ADMIN); this.ksdata = KickstartDataTest.createKickstartWithDefaultKey(this.user.getOrg()); - this.ksdata.getTree().setBasePath("/opt/repo/f9-x86_64/"); + this.ksdata.getTree().setBasePath("/tmp/opt/repo/f9-x86_64/"); // Uncomment this if you want the tests to actually talk to cobbler //Config.get().setString(CobblerXMLRPCHelper.class.getName(), @@ -58,6 +59,7 @@ public class CobblerCommandTest extends BaseTestCaseWithUser { // CobblerConnection.class.getName()); //commitAndCloseSession(); + KickstartableTreeTest.createKickstartTreeItems(this.ksdata.getTree()); CobblerDistroCreateCommand dcreate = new CobblerDistroCreateCommand(ksdata.getTree(), user); dcreate.store(); commit d8bab804a19c318e5bb8e5c2fa3f31efd05b34ad Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Apr 5 16:37:20 2012 +0200 refactor how PackageEvr gets stored not good, if data is stored by stored proc and hibernate at the same time diff --git a/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java b/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java index 94fa65d..0d43cf5 100644 --- a/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java +++ b/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java @@ -540,7 +540,7 @@ public class ActionFactory extends HibernateFactory { // It is possible to have a Package Action with only a package name if (evr != null) { //commit each packageEvr - PackageEvr newEvr = PackageEvrFactory.save(evr); + PackageEvr newEvr = PackageEvrFactory.lookupOrCreatePackageEvr(evr); detail.setEvr(newEvr); } } diff --git a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java index 15852ce..c6e4b30 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java @@ -132,7 +132,7 @@ public class ErrataFactoryTest extends BaseTestCaseWithUser { Package chanPack = PackageTest.createTestPackage(user.getOrg()); //we have to set the 2nd package to a different EVR to not violate a // unique constraint - PackageEvr evr = PackageEvrFactory.createPackageEvr("45", "99", "983"); + PackageEvr evr = PackageEvrFactory.lookupOrCreatePackageEvr("45", "99", "983"); chanPack.setPackageName(errataPack.getPackageName()); chanPack.setPackageEvr(evr); diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java index 02368b9..24ba5d4 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java @@ -41,23 +41,35 @@ public class PackageEvrFactory { * @param evrIn PackageEvr to commit to db * @return Returns a new/committed PackageEvr object. */ - public static PackageEvr save(PackageEvr evrIn) { + private static Long lookupPackageEvr(String epoch, String version, + String release) { CallableMode m = ModeFactory.getCallableMode("Package_queries", "lookup_evr"); Map inParams = new HashMap(); - inParams.put("epoch", evrIn.getEpoch()); - inParams.put("version", evrIn.getVersion()); - inParams.put("release", evrIn.getRelease()); + inParams.put("epoch", epoch); + inParams.put("version", version); + inParams.put("release", release); Map outParams = new HashMap(); outParams.put("evrId", new Integer(Types.NUMERIC)); Map result = m.execute(inParams, outParams); - Long newEvrId = new Long(result.get("evrId").toString()); + return (Long) result.get("evrId"); + } - return lookupPackageEvrById(newEvrId); + /** + * Creates a new PackageEvr object + * @param evr PackageEvr + * @return Returns a committed PackageEvr + */ + public static PackageEvr lookupOrCreatePackageEvr(PackageEvr evr) { + if (evr.getId() != null) { + return lookupPackageEvrById(evr.getId()); + } + return lookupOrCreatePackageEvr(evr.getEpoch(), evr.getVersion(), + evr.getRelease()); } /** @@ -67,13 +79,9 @@ public class PackageEvrFactory { * @param r PackageEvr Release * @return Returns a committed PackageEvr */ - public static PackageEvr createPackageEvr(String e, String v, String r) { - PackageEvr evr = new PackageEvr(); - evr.setEpoch(e); - evr.setVersion(v); - evr.setRelease(r); - - return PackageEvrFactory.save(evr); + public static PackageEvr lookupOrCreatePackageEvr(String e, String v, String r) { + Long id = lookupPackageEvr(e, v, r); + return lookupPackageEvrById(id); } /** diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrFactoryTest.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrFactoryTest.java index 7e0e0eb..325d068 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PackageEvrFactoryTest.java @@ -49,6 +49,6 @@ public class PackageEvrFactoryTest extends RhnBaseTestCase { String version = "1.0.0"; String release = "1"; - return PackageEvrFactory.createPackageEvr(epoch, version, release); + return PackageEvrFactory.lookupOrCreatePackageEvr(epoch, version, release); } } diff --git a/java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java b/java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java index fe3ecb6..31b099b 100644 --- a/java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java +++ b/java/code/src/com/redhat/rhn/domain/server/ProxyInfo.java @@ -64,7 +64,7 @@ public class ProxyInfo { * @param r Release */ public void setVersion(String e, String v, String r) { - setVersion(PackageEvrFactory.createPackageEvr(e, v, r)); + setVersion(PackageEvrFactory.lookupOrCreatePackageEvr(e, v, r)); } diff --git a/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java b/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java index c88f32b..9b5ac10 100644 --- a/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java +++ b/java/code/src/com/redhat/rhn/domain/server/SatelliteServer.java @@ -147,7 +147,7 @@ public class SatelliteServer extends Server { * @param v Version */ public void setVersion(String v) { - setVersion(PackageEvrFactory.createPackageEvr(null, v, "1")); + setVersion(PackageEvrFactory.lookupOrCreatePackageEvr(null, v, "1")); } /** diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java index 6c9d742..fb45cda 100644 --- a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java +++ b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java @@ -313,7 +313,7 @@ public class ServerFactory extends HibernateFactory { public static void save(Server serverIn) { if (serverIn.isSatellite()) { SatelliteServer ss = (SatelliteServer) serverIn; - PackageEvrFactory.save(ss.getVersion()); + PackageEvrFactory.lookupOrCreatePackageEvr(ss.getVersion()); } singleton.saveObject(serverIn); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java index ff03892..2c7ef0d 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java @@ -341,7 +341,7 @@ public class ErrataHandlerTest extends BaseHandlerTestCase { Package chanPack = PackageTest.createTestPackage(admin.getOrg()); //we have to set the 2nd package to a different EVR to not violate a // unique constraint - PackageEvr evr = PackageEvrFactory.createPackageEvr("45", "99", "983"); + PackageEvr evr = PackageEvrFactory.lookupOrCreatePackageEvr("45", "99", "983"); chanPack.setPackageName(errataPack.getPackageName()); chanPack.setPackageEvr(evr); diff --git a/java/code/src/com/redhat/rhn/manager/errata/cache/test/ErrataCacheManagerTest.java b/java/code/src/com/redhat/rhn/manager/errata/cache/test/ErrataCacheManagerTest.java index d6379aa..c588972 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/cache/test/ErrataCacheManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/errata/cache/test/ErrataCacheManagerTest.java @@ -137,8 +137,8 @@ public class ErrataCacheManagerTest extends RhnBaseTestCase { TestUtils.flushAndEvict(s); retval.put("server", s); Package p = PackageTest.createTestPackage(userIn.getOrg()); - PackageEvr evr = PackageEvrFactory.createPackageEvr(p.getPackageEvr().getEpoch(), - p.getPackageEvr().getVersion(), "2"); + PackageEvr evr = PackageEvrFactory.lookupOrCreatePackageEvr( + p.getPackageEvr().getEpoch(), p.getPackageEvr().getVersion(), "2"); evr = (PackageEvr) TestUtils.saveAndReload(evr); Package newPackage = PackageTest.createTestPackage(userIn.getOrg()); newPackage.setPackageName(p.getPackageName()); diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java index e035561..705dcfd 100644 --- a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java @@ -645,7 +645,7 @@ public class PackageManagerTest extends BaseTestCaseWithUser { // Create upgraded package EVR so package will show up from the query PackageEvr upgradedPackageEvr = - PackageEvrFactory.createPackageEvr("1", "1.0.0", "2"); + PackageEvrFactory.lookupOrCreatePackageEvr("1", "1.0.0", "2"); upgradedPackageEvr = (PackageEvr)TestUtils.saveAndReload(upgradedPackageEvr); diff --git a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java index 244a721..93ac610 100644 --- a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java @@ -862,7 +862,7 @@ public class SystemManagerTest extends RhnBaseTestCase { // Will be used for both errata types. Represents an upgraded version of a package // that comes with the errata. PackageEvr upgradedPackageEvr = - PackageEvrFactory.createPackageEvr("1", "1.0.0", "2"); + PackageEvrFactory.lookupOrCreatePackageEvr("1", "1.0.0", "2"); upgradedPackageEvr = (PackageEvr)TestUtils.saveAndReload(upgradedPackageEvr); diff --git a/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java b/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java index c44a5b0..86c89df 100644 --- a/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java +++ b/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java @@ -93,7 +93,8 @@ public class ServerTestUtils { InstalledPackage testInstPack = new InstalledPackage(); String epoch = ""; - PackageEvr evr = PackageEvrFactory.createPackageEvr(epoch, version, release); + PackageEvr evr = PackageEvrFactory.lookupOrCreatePackageEvr(epoch, version, + release); testInstPack.setEvr(evr); PackageArch parch = (PackageArch) TestUtils.lookupFromCacheById( commit cc6dbd5a25233c948147d099d2d968d7bfd8081b Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Apr 5 13:49:00 2012 +0200 removing unnecessary casts diff --git a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java index cc527b2..222eb18 100644 --- a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java +++ b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java @@ -101,7 +101,7 @@ public class ScapManager extends BaseManager { "ruleresult_by_id"); HashMap params = new HashMap(); params.put("rr_id", ruleResultId); - List<XccdfRuleResultDto> result = (List<XccdfRuleResultDto>) m.execute(params); + List<XccdfRuleResultDto> result = m.execute(params); return result.isEmpty() ? null : result.get(0); } @@ -115,7 +115,7 @@ public class ScapManager extends BaseManager { "idents_per_ruleresult"); HashMap params = new HashMap(); params.put("rr_id", ruleResultId); - return (List<XccdfIdentDto>) m.execute(params); + return m.execute(params); } private static List<Map<String, Object>> transposeView(DataResult testResultsRaw) { commit 7893444cb28e87709238da737df58a2aef4f265a Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Apr 5 13:48:24 2012 +0200 removing unnecessary else statement diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java index 40ca594..ff36b53 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java @@ -76,8 +76,6 @@ public class RuleDetailsAction extends RhnAction implements Listable { if (ruleResult == null) { return null; } - else { - return ruleResult.getIdentsWithoutIdref(); - } + return ruleResult.getIdentsWithoutIdref(); } } commit c743f7422875e557f7c284f314725596b5895ea5 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 4 18:30:26 2012 +0200 fix ProvisionVirtualizationWizardActionTest.testStepOne diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java index 8caf11c..40b6fd6 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java @@ -83,8 +83,6 @@ public class ProvisionVirtualizationWizardActionTest extends RhnMockStrutsTestCa public void testStepOne() throws Exception { actionPerform(); verifyNoActionErrors(); - assertNotNull(request.getAttribute(RequestContext.SYSTEM)); - assertNotNull(request.getAttribute(ScheduleKickstartWizardAction.HAS_PROFILES)); } public void testStepTwo() throws Exception {

1 0

Changes to 'refs/tags/oracle-xe-selinux-10.2.0.24-1'
by Jan Pazdziora 10 Apr '12

10 Apr '12

Tag 'oracle-xe-selinux-10.2.0.24-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-10 12:39 +0000 Tagging package [oracle-xe-selinux] version [10.2.0.24-1] in directory [selinux/oracle-xe-selinux/]. Changes since spacewalk-java-1.8.38-1: Jan Pazdziora (4): The backup.sh from Oracle XE 10g seems to want to access urandom. The backup.sh and restore.sh need to run as sqlplus, so that their log files can be used by sqlplus. The rman is more like the database server process. Automatic commit of package [oracle-xe-selinux] release [10.2.0.24-1]. --- rel-eng/packages/oracle-xe-selinux | 2 +- selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 9 ++++++++- selinux/oracle-xe-selinux/oracle-xe.fc | 3 +++ selinux/oracle-xe-selinux/oracle-xe.te | 3 +++ 4 files changed, 15 insertions(+), 2 deletions(-) ---

1 0

4 commits - rel-eng/packages selinux/oracle-xe-selinux
by Jan Pazdziora 10 Apr '12

10 Apr '12

rel-eng/packages/oracle-xe-selinux | 2 +- selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 9 ++++++++- selinux/oracle-xe-selinux/oracle-xe.fc | 3 +++ selinux/oracle-xe-selinux/oracle-xe.te | 3 +++ 4 files changed, 15 insertions(+), 2 deletions(-) New commits: commit 12275e225f6a9086364100fa882303d38e38b6f9 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 10 14:39:42 2012 +0200 Automatic commit of package [oracle-xe-selinux] release [10.2.0.24-1]. diff --git a/rel-eng/packages/oracle-xe-selinux b/rel-eng/packages/oracle-xe-selinux index 6c4a872..a24727f 100644 --- a/rel-eng/packages/oracle-xe-selinux +++ b/rel-eng/packages/oracle-xe-selinux @@ -1 +1 @@ -10.2.0.23-1 selinux/oracle-xe-selinux/ +10.2.0.24-1 selinux/oracle-xe-selinux/ diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec index eb2f7da..6a224b5 100644 --- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec +++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec @@ -5,7 +5,7 @@ %define modulename oracle-xe Name: oracle-xe-selinux -Version: 10.2.0.23 +Version: 10.2.0.24 Release: 1%{?dist} Summary: SELinux policy module supporting Oracle XE Group: System Environment/Base @@ -145,6 +145,13 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable %changelog +* Tue Apr 10 2012 Jan Pazdziora 10.2.0.24-1 +- The rman is more like the database server process. +- The backup.sh and restore.sh need to run as sqlplus, so that their log files + can be used by sqlplus. +- The backup.sh from Oracle XE 10g seems to want to access urandom. +- Allow Oracle database to ptrace self. + * Wed Nov 30 2011 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.23-1 - system user uids are < 1000 on Fedora 16 commit 2ca684a5690fe714dcee98f82b1ff2653918098c Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 10 14:31:13 2012 +0200 The rman is more like the database server process. Addressing avc: denied { read } for pid=32408 comm="rman" name="spfile2init.ora" dev=dm-0 ino=81133643 scontext=root:system_r:oracle_sqlplus_t:s0-s0:c0.c1023 tcontext=root:object_r:oracle_db_log_t:s0 tclass=file during restore.sh. diff --git a/selinux/oracle-xe-selinux/oracle-xe.fc b/selinux/oracle-xe-selinux/oracle-xe.fc index 1a46a00..0d5491d 100644 --- a/selinux/oracle-xe-selinux/oracle-xe.fc +++ b/selinux/oracle-xe-selinux/oracle-xe.fc @@ -22,6 +22,7 @@ /usr/lib/oracle/xe/app/oracle/product/(.*/)?bin/orapwd gen_context(system_u:object_r:oracle_db_exec_t,s0) /usr/lib/oracle/xe/app/oracle/product/(.*/)?bin/sqlplus gen_context(system_u:object_r:oracle_sqlplus_exec_t,s0) /usr/lib/oracle/xe/app/oracle/product/(.*/)?bin/tnslsnr gen_context(system_u:object_r:oracle_tnslsnr_exec_t,s0) +/usr/lib/oracle/xe/app/oracle/product/(.*/)?bin/rman gen_context(system_u:object_r:oracle_db_exec_t,s0) # many jars are not located under lib, jre, or java directories /usr/lib/oracle/xe/app/oracle/product/(.*/)?.+\.jar gen_context(system_u:object_r:shlib_t,s0) commit 21c06b9808b6fca4c7efd3d113fcc2163f4fee03 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 10 14:22:23 2012 +0200 The backup.sh and restore.sh need to run as sqlplus, so that their log files can be used by sqlplus. Addressing avc: denied { write } for pid=26511 comm="sqlplus" path="/tmp/rman_normlog26505.log" dev=dm-0 ino=62193725 scontext=root:system_r:oracle_sqlplus_t:s0-s0:c0.c1023 tcontext=root:object_r:tmp_t:s0 tclass=file diff --git a/selinux/oracle-xe-selinux/oracle-xe.fc b/selinux/oracle-xe-selinux/oracle-xe.fc index d5d818c..1a46a00 100644 --- a/selinux/oracle-xe-selinux/oracle-xe.fc +++ b/selinux/oracle-xe-selinux/oracle-xe.fc @@ -13,6 +13,8 @@ /usr/lib/oracle/xe/app/oracle/product/(.*/)?audit(/.*)? gen_context(user_u:object_r:oracle_db_log_t,s0) /usr/lib/oracle/xe/app/oracle/product/(.*/)?server/config(/.*)? gen_context(user_u:object_r:oracle_db_log_t,s0) /usr/lib/oracle/xe/app/oracle/product/(.*/)?server/config/scripts(/.*)? gen_context(user_u:object_r:oracle_sqlplus_log_t,s0) +/usr/lib/oracle/xe/app/oracle/product/(.*/)?server/config/scripts/backup\.sh gen_context(user_u:object_r:oracle_sqlplus_exec_t,s0) +/usr/lib/oracle/xe/app/oracle/product/(.*/)?server/config/scripts/restore\.sh gen_context(user_u:object_r:oracle_sqlplus_exec_t,s0) # otherwise these would default to bin_t /usr/lib/oracle/xe/app/oracle/product/(.*/)?bin/lsnrctl gen_context(system_u:object_r:oracle_lsnrctl_exec_t,s0) commit 496b6002344115868f4c587262aa07aee2a86972 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 10 14:19:08 2012 +0200 The backup.sh from Oracle XE 10g seems to want to access urandom. Addressing avc: denied { read } for pid=26280 comm="backup.sh" name="urandom" dev=tmpfs ino=969 scontext=root:system_r:oracle_sqlplus_t:s0-s0:c0.c1023 tcontext=system_u:object_r:urandom_device_t:s0 tclass=chr_file diff --git a/selinux/oracle-xe-selinux/oracle-xe.te b/selinux/oracle-xe-selinux/oracle-xe.te index af31a47..e3c9cbf 100644 --- a/selinux/oracle-xe-selinux/oracle-xe.te +++ b/selinux/oracle-xe-selinux/oracle-xe.te @@ -10,6 +10,7 @@ require { type oracle_db_log_t; type http_cache_port_t; type initrc_t; + type urandom_device_t; } rw_files_pattern(oracle_db_t, oracle_sqlplus_log_t, oracle_sqlplus_log_t) @@ -36,3 +37,5 @@ term_dontaudit_use_console(oracle_db_t) term_dontaudit_use_console(oracle_tnslsnr_t) mcs_ptrace_all(oracle_db_t) + +allow oracle_sqlplus_t urandom_device_t:chr_file read;

1 0

Changes to 'refs/tags/spacewalk-java-1.8.38-1'
by Jan Pazdziora 10 Apr '12

10 Apr '12

Tag 'spacewalk-java-1.8.38-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-10 12:38 +0000 Tagging package [spacewalk-java] version [1.8.38-1] in directory [java/]. Changes since spacewalk-backend-1.8.13-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-java] release [1.8.38-1]. --- java/spacewalk-java.spec | 12 +++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora 10 Apr '12

10 Apr '12

java/spacewalk-java.spec | 12 +++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) New commits: commit ca6a4ebc2a8e5292ca21fab79686401facea5176 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 10 14:38:47 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.38-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 4ee6d87..62359bc 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.37 +Version: 1.8.38 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,16 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Apr 10 2012 Jan Pazdziora 1.8.38-1 +- OpenSCAP integration -- view latest results of whole infrastructure + (slukasik(a)redhat.com) +- The tool is called OpenSCAP actually. (slukasik(a)redhat.com) +- Add missing </a> tag in case when the serverName is unknown. + (slukasik(a)redhat.com) +- The system.config.listFiles should return channel label, not name. +- 810871 - Reduce languages available in editarea to only common / useful ones. + (sherr(a)redhat.com) + * Fri Apr 06 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.37-1 - improved performance of repomd generation diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index ab22b37..8ce821e 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.37-1 java/ +1.8.38-1 java/

1 0

Changes to 'refs/tags/spacewalk-backend-1.8.13-1'
by Jan Pazdziora 10 Apr '12

10 Apr '12

Tag 'spacewalk-backend-1.8.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-10 12:38 +0000 Tagging package [spacewalk-backend] version [1.8.13-1] in directory [backend/]. Changes since spacewalk-setup-1.8.5-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-backend] release [1.8.13-1]. --- backend/spacewalk-backend.spec | 8 +++++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora 10 Apr '12

10 Apr '12

backend/spacewalk-backend.spec | 8 +++++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 1579b4ed15841da5ce1cff5af753403b4fd6cce8 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 10 14:38:10 2012 +0200 Automatic commit of package [spacewalk-backend] release [1.8.13-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 2ca49a3..62b82a5 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.8.12 +Version: 1.8.13 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -688,6 +688,12 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Tue Apr 10 2012 Jan Pazdziora 1.8.13-1 +- rhn-schema-stats: update manual page (mzazrivec(a)redhat.com) +- rhn-schema-stats: support for PostgreSQL (mzazrivec(a)redhat.com) +- rhn-db-stats: update manual page (mzazrivec(a)redhat.com) +- rhn-db-stats: support for PostgreSQL (mzazrivec(a)redhat.com) + * Thu Apr 05 2012 Jan Pazdziora 1.8.12-1 - 809936 - we need to insert NULLs to avoid vn_rhnserverhistory_details. diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 882ce41..68d47e4 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.8.12-1 backend/ +1.8.13-1 backend/

1 0

Changes to 'refs/tags/spacewalk-setup-1.8.5-1'
by Jan Pazdziora 10 Apr '12

10 Apr '12

Tag 'spacewalk-setup-1.8.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-10 12:37 +0000 Tagging package [spacewalk-setup] version [1.8.5-1] in directory [spacewalk/setup/]. Changes since osad-5.10.43-1: Jan Pazdziora (4): The system.config.listFiles should return channel label, not name. The spacewalk-setup script does not seem to need Net::LibIDN directly. To support the whole Unicode with idn_to_ascii, we need to specify utf8. Automatic commit of package [spacewalk-setup] release [1.8.5-1]. Simon Lukasik (3): Add missing </a> tag in case when the serverName is unknown. The tool is called OpenSCAP actually. OpenSCAP integration -- view latest results of whole infrastructure --- java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml | 37 + java/code/src/com/redhat/rhn/frontend/action/audit/ListXccdfAction.java | 67 +++ java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java | 189 ++++++++++ java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java | 112 +++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 26 + java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java | 2 java/code/src/com/redhat/rhn/manager/audit/ScapManager.java | 14 java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1 java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp | 23 + java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf | 38 ++ java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf | 3 java/code/webapp/WEB-INF/struts-config.xml | 7 rel-eng/packages/spacewalk-setup | 2 satellite/install/install.pl | 2 spacewalk/setup/bin/spacewalk-setup | 1 spacewalk/setup/lib/Spacewalk/Setup.pm | 6 spacewalk/setup/spacewalk-setup.spec | 6 18 files changed, 532 insertions(+), 10 deletions(-) ---

1 0

rel-eng/packages spacewalk/setup
by Jan Pazdziora 10 Apr '12

10 Apr '12

rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/spacewalk-setup.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 59e6d8f92328e68c9114677e31202e1f277b9c14 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 10 14:37:33 2012 +0200 Automatic commit of package [spacewalk-setup] release [1.8.5-1]. diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index b3beab2..be6a65e 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -1.8.4-1 spacewalk/setup/ +1.8.5-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index 07544a3..708c31e 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup -Version: 1.8.4 +Version: 1.8.5 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk @@ -106,6 +106,10 @@ rm -rf %{buildroot} %{_mandir}/man8/spacewalk-make-mount-points* %changelog +* Tue Apr 10 2012 Jan Pazdziora 1.8.5-1 +- To support the whole Unicode with idn_to_ascii, we need to specify utf8. +- The spacewalk-setup script does not seem to need Net::LibIDN directly. + * Thu Apr 05 2012 Jan Pazdziora 1.8.4-1 - fixed clearing db for postgresql installation (michael.mraka(a)redhat.com)

1 0

satellite/install spacewalk/setup
by Jan Pazdziora 10 Apr '12

10 Apr '12

satellite/install/install.pl | 2 +- spacewalk/setup/lib/Spacewalk/Setup.pm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 48009aef25179002e18a133ce6f9916bced3c6cd Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 10 13:57:27 2012 +0200 To support the whole Unicode with idn_to_ascii, we need to specify utf8. diff --git a/satellite/install/install.pl b/satellite/install/install.pl index 03a737c..049ff2d 100755 --- a/satellite/install/install.pl +++ b/satellite/install/install.pl @@ -345,7 +345,7 @@ Import values to be used by Satellite [y/n]", if ($answers->{'rhn-http-proxy'}) { $answers->{'rhn-http-proxy'} =~ /^([^:\/]*)(:\d+)?/; - my ($host, $port) = (Net::LibIDN::idn_to_ascii($1), $2); + my ($host, $port) = (Net::LibIDN::idn_to_ascii($1, "utf8"), $2); ask(-question => "HTTP Proxy Port", -test => qr/\d+/, diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index 4077275..5e77650 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -192,7 +192,7 @@ sub load_answer_file { close FH; } if ($answers->{'db-host'}) { - $answers->{'db-host'} = Net::LibIDN::idn_to_ascii($answers->{'db-host'}); + $answers->{'db-host'} = Net::LibIDN::idn_to_ascii($answers->{'db-host'}, "utf8"); } return; } @@ -748,7 +748,7 @@ REDO_CONNECT: -default => 'localhost', -answer => \$answers->{'db-host'}); - $answers->{'db-host'} = Net::LibIDN::idn_to_ascii($answers->{'db-host'}); + $answers->{'db-host'} = Net::LibIDN::idn_to_ascii($answers->{'db-host'}, "utf8"); $data{'db-name'} = _oracle_make_dsn_string($answers); if (defined $data{'db-name'}) { # Try db-name as SID for host (//host:port/name). @@ -842,7 +842,7 @@ sub postgresql_get_database_answers { -answer => \$answers->{'db-host'}); if ($answers->{'db-host'} ne '') { - $answers->{'db-host'} = Net::LibIDN::idn_to_ascii($answers->{'db-host'}); + $answers->{'db-host'} = Net::LibIDN::idn_to_ascii($answers->{'db-host'}, "utf8"); ask( -noninteractive => $opts->{"non-interactive"}, -question => "Port",

1 0

spacewalk/setup
by Jan Pazdziora 10 Apr '12

10 Apr '12

spacewalk/setup/bin/spacewalk-setup | 1 - 1 file changed, 1 deletion(-) New commits: commit 2460573da2e290ac07e4b595ad15499687086d48 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 10 13:54:34 2012 +0200 The spacewalk-setup script does not seem to need Net::LibIDN directly. diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 80e780e..a5edec7 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -30,7 +30,6 @@ use Sys::Hostname (); use Spacewalk::Setup (); use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC); use IO::Socket (); -use Net::LibIDN (); use RHN::DB (); my $DEBUG;

1 0

3 commits - java/code
by Šimon Lukašík 10 Apr '12

10 Apr '12

java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml | 37 + java/code/src/com/redhat/rhn/frontend/action/audit/ListXccdfAction.java | 67 +++ java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java | 189 ++++++++++ java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java | 112 +++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 26 + java/code/src/com/redhat/rhn/manager/audit/ScapManager.java | 14 java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1 java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp | 23 + java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf | 38 ++ java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf | 3 java/code/webapp/WEB-INF/struts-config.xml | 7 12 files changed, 521 insertions(+), 2 deletions(-) New commits: commit ca89dda11630aaed127bdeda894d1140cb7ab893 Author: Simon Lukasik <slukasik(a)redhat.com> Date: Wed Apr 4 13:11:28 2012 +0200 OpenSCAP integration -- view latest results of whole infrastructure 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 3f810df..9e4d8eb 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 @@ -32,6 +32,43 @@ </query> </mode> +<mode name="latest_testresults_by_user" class="com.redhat.rhn.frontend.dto.XccdfTestResultDto"> + <elaborator name="testresult_counts"/> + <query params="user_id"> + SELECT + tr.id as xid, + tr.server_id as sid, + s.name as server_name, + xp.identifier as profile, + sa.completion_time as completed + FROM rhnUserServerPerms usp, + rhnXccdfTestresult tr, + rhnXccdfProfile xp, + rhnActionScap ras, + rhnServerAction sa, + rhnServer s + WHERE usp.user_id = :user_id + AND usp.server_id = tr.server_id + AND sa.server_id = tr.server_id + AND tr.action_scap_id = ras.id + AND sa.action_id = ras.action_id + AND tr.profile_id = xp.id + AND s.id = tr.server_id + ORDER BY completed DESC + </query> +</mode> + +<query name="testresult_counts" multiple="t" column="xid"> + SELECT tr.id as xid, rrt.label, count(rr.id) as count + FROM rhnXccdfTestresult tr, + rhnXccdfRuleresult rr, + rhnXccdfRuleresultType rrt + WHERE tr.id in (%s) + AND tr.id = rr.testresult_id + AND rr.result_id = rrt.id + GROUP BY tr.id, rrt.label +</query> + <mode name="show_ruleresults" class="com.redhat.rhn.frontend.dto.XccdfRuleResultDto"> <query params="xid"> SELECT rr.id, rrt.label, rr.testresult_id as test_result_id diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/ListXccdfAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/ListXccdfAction.java new file mode 100644 index 0000000..93bf8a7 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/audit/ListXccdfAction.java @@ -0,0 +1,67 @@ +/** + * Copyright (c) 2012 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.action.audit; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.frontend.taglibs.list.TagHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; +import com.redhat.rhn.manager.audit.ScapManager; + +/** + * ListXccdfAction + * @version $Rev$ + */ + +public class ListXccdfAction extends RhnAction implements Listable { + + /** + * {@inheritDoc} + */ + public ActionForward execute(ActionMapping mapping, ActionForm formIn, + HttpServletRequest request, + HttpServletResponse response) { + RequestContext context = new RequestContext(request); + + ListHelper helper = new ListHelper(this, request); + helper.execute(); + + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); + } + + /** + * {@inheritDoc} + */ + public List getResult(RequestContext context) { + HttpServletRequest request = context.getRequest(); + User user = context.getLoggedInUser(); + DataResult results = ScapManager.latestTestResultByUser(user); + TagHelper.bindElaboratorTo("groupSet", results.getElaborator(), request); + return results; + } +} diff --git a/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java new file mode 100644 index 0000000..9cdcd1a --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultCounts.java @@ -0,0 +1,189 @@ +/** + * Copyright (c) 2012 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.dto; + +import java.util.HashMap; +import java.util.List; + +/** + * Simple DTO for transfering data from the DB to the UI through datasource. + * @version $Rev$ + */ +public abstract class XccdfTestResultCounts { + + private static final String PASS_LABEL = "pass"; + private static final String FAIL_LABEL = "fail"; + private static final String ERROR_LABEL = "error"; + private static final String UNKNOWN_LABEL = "unknown"; + private static final String NOTAPPLICABLE_LABEL = "notapplicable"; + private static final String NOTCHECKED_LABEL = "notchecked"; + private static final String NOTSELECTED_LABEL = "notselected"; + private static final String INFORMATIONAL_LABEL = "informational"; + private static final String FIXED_LABEL = "fixed"; + + private HashMap<String, Long> countMap; + + /* Following properties are set by testresult_counts elaborator. */ + private List label; + private List count; + + + /** + * Returns the list of labels (content of xccdf:result). + * @return the result + */ + public List getLabel() { + return label; + } + + /** + * Sets the list of labels (content of xccdf:result). + * @param labelIn to set + */ + public void setLabel(List labelIn) { + label = labelIn; + } + + /** + * Returns the list of counts. The count represents a number + * of xccdf:rule-result elements per given label. + * @return the result + */ + public List getCount() { + return count; + } + + /** + * Sets the list of counts. + * @param countIn to set + */ + public void setCount(List countIn) { + count = countIn; + } + + /** + * Get the count of passed rules. + * @return count of passed rules + */ + public Long getPass() { + return getCountOf(PASS_LABEL); + } + + /** + * Get the count of failed rules. + * @return count of failed rules + */ + public Long getFail() { + return getCountOf(FAIL_LABEL); + } + + /** + * Get the count of errorneous rules. + * @return count of errorneous rules + */ + public Long getError() { + return getCountOf(ERROR_LABEL); + } + + /** + * Get the count of rules with unknown result. + * @return count of rules with unknown result + */ + public Long getUnknown() { + return getCountOf(UNKNOWN_LABEL); + } + + /** + * Get the count of rules with notapplicable result. + * @return count of rules with notapplicable result + */ + public Long getNotapplicable() { + return getCountOf(NOTAPPLICABLE_LABEL); + } + + /** + * Get the count of rules with notchecked result. + * @return count of rules with notchecked result + */ + public Long getNotchecked() { + return getCountOf(NOTCHECKED_LABEL); + } + + /** + * Get the count of rules with notselected result. + * @return count of rules with notselected result + */ + public Long getNotselected() { + return getCountOf(NOTSELECTED_LABEL); + } + + /** + * Get the count of rules with informational result. + * @return count of rules with informational result + */ + public Long getInformational() { + return getCountOf(INFORMATIONAL_LABEL); + } + + /** + * Get the count of rules with fixed result. + * @return count of rules with fixed result + */ + public Long getFixed() { + return getCountOf(FIXED_LABEL); + } + + /** + * For a simple view, get satisfied results + * @return the count + */ + public Long getSatisfied() { + return getPass() + getFixed(); + } + + /** + * For a simple view, get dissatisfied results + * @return the count + */ + public Long getDissatisfied() { + return getFail(); + } + + /** + * For a simple view, get results which are generally unknown + * @return the count + */ + public Long getSatisfactionUnknown() { + return getError() + getUnknown() + getNotchecked(); + } + + private Long getCountOf(String resultLabel) { + Long result = getCountMap().get(resultLabel); + return (result != null) ? result : 0; + } + + private HashMap<String, Long> getCountMap() { + if (this.countMap == null) { + this.countMap = new HashMap<String, Long>(); + if (this.label != null && this.count != null) { + for (int i = 0; i < this.label.size(); i++) { + this.countMap.put((String) this.label.get(i), + (Long) this.count.get(i)); + } + } + } + return this.countMap; + } +} diff --git a/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java new file mode 100644 index 0000000..0e650f0 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/dto/XccdfTestResultDto.java @@ -0,0 +1,112 @@ +/** + * Copyright (c) 2012 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.dto; + +import java.util.Date; + +/** + * Simple DTO for transfering data from the DB to the UI through datasource. + * @version $Rev$ + */ +public class XccdfTestResultDto extends XccdfTestResultCounts { + + private Long xid; + private Long sid; + private String serverName; + private String profile; + private Date completed; + + /** + * Returns id of xccdf:TestResult + * @return the xid + */ + public Long getXid() { + return this.xid; + } + + /** + * Sets the id of xccdf:TestResult + * @param xidIn to set + */ + public void setXid(Long xidIn) { + this.xid = xidIn; + } + + /** + * Returns id of targeted system + * @return the sid + */ + public Long getSid() { + return this.sid; + } + + /** + * Sets the id of targeted system + * @param sidIn to set + */ + public void setSid(Long sidIn) { + this.sid = sidIn; + } + + /** + * Returns name of the targeted system + * @return the name + */ + public String getServerName() { + return this.serverName; + } + + /** + * Sets the name of the targeted system + * @param serverNameIn to set + */ + public void setServerName(String serverNameIn) { + this.serverName = serverNameIn; + } + + /** + * Returns the name of assigned xccdf:Profile + * @return the name + */ + public String getProfile() { + return this.profile; + } + + /** + * Sets the name of assigned xccdf:Profile + * @param profileIn to set + */ + public void setProfile(String profileIn) { + this.profile = profileIn; + } + + /** + * Returns completetion time of scan + * @return completetion time + */ + public Date getCompleted() { + return new Date(this.completed.getYear(), this.completed.getMonth(), + this.completed.getDate(), this.completed.getHours(), + this.completed.getMinutes(), this.completed.getSeconds()); + } + + /** + * Sets the completetion time of scan + * @param completedIn to set + */ + public void setCompleted(Date completedIn) { + this.completed = completedIn; + } +} 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 fa0f59a..0bfbdd5 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 @@ -367,6 +367,12 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" <context context-type="sourcefile">Navigation Menu</context> </context-group> </trans-unit> + <trans-unit id="OpenSCAP"> +<source>OpenSCAP</source> + <context-group name="ctx"> + <context context-type="sourcefile">Navigation Menu</context> + </context-group> + </trans-unit> <trans-unit id="Channel Management"> <source>Channel Management</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 fd70f40..afe8387 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 @@ -11975,6 +11975,30 @@ the Red Hat Enterprise Linux System Administration Guide.</stro </trans-unit> </group> + <group> + <context-group name="ctx"> + <context context-type="sourcefile">View of SCAP scans for whole infrastructure</context> + </context-group> + <trans-unit id="audit.listxccdf.jsp.profile"> + <source>Xccdf Profile</source> + </trans-unit> + <trans-unit id="audit.listxccdf.jsp.noscans"> + <source>There are no SCAP results reported yet.</source> + </trans-unit> + <trans-unit id="audit.listxccdf.jsp.satisfied"> + <source>Satisfied</source> + </trans-unit> + <trans-unit id="audit.listxccdf.jsp.dissatisfied"> + <source>Dissatisfied</source> + </trans-unit> + <trans-unit id="audit.listxccdf.jsp.satisfactionunknown"> + <source>Unknown</source> + </trans-unit> + <trans-unit id="audit.listxccdf.jsp.tooltip"> + <source>The last three columns represent numbers of xccdf:Rules evaluated with a given result. Satisfied = P + X, Dissatisfied = F, Unknown = E + U + K.</source> + </trans-unit> + </group> +  <group> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java index 3040932..cc527b2 100644 --- a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java +++ b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java @@ -51,6 +51,20 @@ public class ScapManager extends BaseManager { } /** + * Show brief results of all scans accessible by user. + * Sorted by date, descending. + * @param user The user requesting. + * @return The list of scan results + */ + public static DataResult latestTestResultByUser(User user) { + SelectMode m = ModeFactory.getMode("scap_queries", + "latest_testresults_by_user"); + HashMap params = new HashMap(); + params.put("user_id", user.getId()); + return makeDataResult(params, new HashMap(), null, m); + } + + /** * Show brief results of all scans for given system * @param server The system for which to search * @return The list of scan results in brief diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml index 129cd55..a79d842 100644 --- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml +++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml @@ -173,6 +173,7 @@ <rhn-tab name="Overview" url="/rhn/audit/Overview.do"> <rhn-tab name="Reviews" url="/rhn/audit/Machine.do" /> </rhn-tab> + <rhn-tab name="OpenSCAP" url="/rhn/audit/ListXccdf.do" /> <rhn-tab name="Search" url="/rhn/audit/Search.do" /> </rhn-tab> <rhn-tab name="config.nav.config" url="/rhn/configuration/Overview.do" acl="org_entitlement(rhn_provisioning);user_role(config_admin)"> diff --git a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp new file mode 100644 index 0000000..b57d55b --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp @@ -0,0 +1,23 @@ +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> +<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> +<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> + +<html:xhtml/> +<html> +<head> + <meta name="page-decorator" content="none" /> +</head> + +<body> + +<rhn:toolbar base="h1" img="/img/rhn-icon-system.gif" imgAlt="audit.jsp.alt"> + <bean:message key="system.audit.listscap.jsp.overview"/> +</rhn:toolbar> + +<%@ include file="/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf" %> + +</body> +</html> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf new file mode 100644 index 0000000..05be7e9 --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/xccdf-easy-list.jspf @@ -0,0 +1,38 @@ +<rl:listset name="groupSet" legend="xccdf"> + <rhn:csrf /> + <rhn:submitted /> + + <rl:list emptykey="audit.listxccdf.jsp.noscans"> + <rl:decorator name="ElaborationDecorator"/> + <rl:decorator name="PageSizeDecorator"/> + + <rl:column headerkey="systemlist.jsp.system" sortable="true" sortattr="serverName"> + <c:out escapeXml="false" + value="<a href=\"/rhn/systems/details/audit/ListScap.do?sid=${current.sid}\">"/> + <c:out value="${current.serverName}"/> + <c:out escapeXml="false" value="</a>"/> + </rl:column> + <rl:column headerkey="audit.listxccdf.jsp.profile" sortable="true" sortattr="profile" + filterattr="profile"> + <c:out escapeXml="false" + value="<a href=\"/rhn/systems/details/audit/XccdfDetails.do?sid=${current.sid}&xid=${current.xid}\">"/> + <c:out value="${current.profile}"/> + <c:out escapeXml="false" value="</a>"/> + </rl:column> + <rl:column headerkey="system.audit.listscap.jsp.completed" sortable="true" sortattr="completed" + defaultsort="desc"> + <c:out value="${current.completed}"/> + </rl:column> + <rl:column headerkey="audit.listxccdf.jsp.satisfied"> + <c:out value="${current.satisfied}"/> + </rl:column> + <rl:column headerkey="audit.listxccdf.jsp.dissatisfied"> + <c:out value="${current.dissatisfied}"/> + </rl:column> + <rl:column headerkey="audit.listxccdf.jsp.satisfactionunknown"> + <c:out value="${current.satisfactionUnknown}"/> + </rl:column> + </rl:list> +</rl:listset> + +<rhn:tooltip key="audit.listxccdf.jsp.tooltip"/> diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 9c7bb6e..2c79bb3 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -1923,6 +1923,13 @@ <forward name="success" path="/audit/Machine.do" redirect="true"/> </action> + <action path="/audit/ListXccdf" + scope="request" + input="/WEB-INF/pages/audit/listxccdf.jsp" + type="com.redhat.rhn.frontend.action.audit.ListXccdfAction"> + <forward name="default" path="/WEB-INF/pages/audit/listxccdf.jsp"/> + </action> +  <action path="/errata/Search" name="errataSearchForm" commit 816b1fc01c3d97e83d4153748e24eb0ec8faaab6 Author: Simon Lukasik <slukasik(a)redhat.com> Date: Tue Apr 10 10:55:12 2012 +0200 The tool is called OpenSCAP actually. 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 e8fdccb..fd70f40 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 @@ -11817,7 +11817,7 @@ the Red Hat Enterprise Linux System Administration Guide.</stro <context context-type="sourcefile">View of SCAP scans for given system</context> </context-group> <trans-unit id="system.audit.listscap.jsp.overview"> - <source>Open SCAP Scans</source> + <source>OpenSCAP Scans</source> </trans-unit> <trans-unit id="system.audit.listscap.jsp.missing"> <source>This system does not yet have OpenSCAP scan capability. OpenSCAP scanning requires that particular software is installed and enabled on your system. You may ensure that OpenSCAP capability wil be enabled on this system by installing "{0}" package.</source> commit 628703dd0c19b4da810e1b870f6cfe7a23edd8e5 Author: Simon Lukasik <slukasik(a)redhat.com> Date: Fri Apr 6 18:35:55 2012 +0200 Add missing </a> tag in case when the serverName is unknown. diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf index 959f4db..b4efe33 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf @@ -15,6 +15,7 @@ <bean:message key="sdc.details.overview.unknown"/> </c:when> <c:otherwise> - <c:out value="${current.name}</a>" escapeXml="false" /> + <c:out value="${current.name}" escapeXml="false" /> </c:otherwise> </c:choose> + <c:out value="</a>" escapeXml="false"/>

1 0

java/code
by Jan Pazdziora 10 Apr '12

10 Apr '12

java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dd8ac9ac8b3b83bc805929c46c25f838e85259b9 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 10 10:57:44 2012 +0200 The system.config.listFiles should return channel label, not name. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java index a17ddfb..3f8fe0e 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigFileNameDtoSerializer.java @@ -72,7 +72,7 @@ public class ConfigFileNameDtoSerializer implements XmlRpcCustomSerializer { ConfigChannelType.lookup(dto.getConfigChannelType()); helper.add("channel_type", type); if (type.equals(ConfigChannelType.global())) { - helper.add("channel_label", dto.getConfigChannelName()); + helper.add("channel_label", dto.getConfigChannelLabel()); } helper.add("last_modified", dto.getLastModifiedDate()); helper.writeTo(output);

1 0

Changes to 'refs/tags/osad-5.10.43-1'
by StephenHerr 09 Apr '12

09 Apr '12

Tag 'osad-5.10.43-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-09 15:43 +0000 Tagging package [osad] version [5.10.43-1] in directory [client/tools/osad/]. Changes since spacewalk-java-1.8.37-1: Jan Pazdziora (1): Allow Oracle database to ptrace self. Milan Zazrivec (4): rhn-db-stats: support for PostgreSQL rhn-db-stats: update manual page rhn-schema-stats: support for PostgreSQL rhn-schema-stats: update manual page Stephen Herr (3): 810871 - Reduce languages available in editarea to only common / useful ones. 810908 - Make osa-dispatcher use the hostname in the rhn.conf if present Automatic commit of package [osad] release [5.10.43-1]. --- backend/satellite_tools/rhn-db-stats | 36 +++--- backend/satellite_tools/rhn-db-stats.sgml | 7 - backend/satellite_tools/rhn-schema-stats | 54 +++++++--- backend/satellite_tools/rhn-schema-stats.sgml | 7 - client/tools/osad/osad.spec | 6 - client/tools/osad/src/osa_dispatcher.py | 8 + java/code/webapp/WEB-INF/pages/common/fragments/editarea.jspf | 4 rel-eng/packages/osad | 2 selinux/oracle-xe-selinux/oracle-xe.te | 1 9 files changed, 79 insertions(+), 46 deletions(-) ---

1 0

2 commits - client/tools rel-eng/packages
by StephenHerr 09 Apr '12

09 Apr '12

client/tools/osad/osad.spec | 6 +++++- client/tools/osad/src/osa_dispatcher.py | 8 ++++++-- rel-eng/packages/osad | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) New commits: commit a3edb0b505cefadfff35ce0ee6397709555cbd62 Author: Stephen Herr <sherr(a)redhat.com> Date: Mon Apr 9 11:43:29 2012 -0400 Automatic commit of package [osad] release [5.10.43-1]. diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index f66bd5c..fae875a 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -16,7 +16,7 @@ Group: System Environment/Daemons License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 5.10.42 +Version: 5.10.43 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -278,6 +278,10 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {} %endif %changelog +* Mon Apr 09 2012 Stephen Herr <sherr(a)redhat.com> 5.10.43-1 +- 810908 - Make osa-dispatcher use the hostname in the rhn.conf if present + (sherr(a)redhat.com) + * Tue Apr 03 2012 Jan Pazdziora 5.10.42-1 - use %%global, not %%define (msuchy(a)redhat.com) - osad.src:477: W: macro-in-%%changelog %%descriptions (msuchy(a)redhat.com) diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index f6740f2..b92821a 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.10.42-1 client/tools/osad/ +5.10.43-1 client/tools/osad/ commit 30b06a259d20516c541e509a853cfd3de98255c7 Author: Stephen Herr <sherr(a)redhat.com> Date: Mon Apr 9 11:43:12 2012 -0400 810908 - Make osa-dispatcher use the hostname in the rhn.conf if present diff --git a/client/tools/osad/src/osa_dispatcher.py b/client/tools/osad/src/osa_dispatcher.py index 8b43b1f..2071672 100644 --- a/client/tools/osad/src/osa_dispatcher.py +++ b/client/tools/osad/src/osa_dispatcher.py @@ -130,11 +130,15 @@ class Runner(jabber_lib.Runner): log_debug(1, "Upstream notification server started on port", port) self._tcp_server.set_jabber_connection(c) - + self._poll_interval = CFG.poll_interval self._next_poll_interval = self._poll_interval - hostname = socket.gethostname() + if self._jabber_servers and self._jabber_servers[0]: + hostname = self._jabber_servers[0] + else: + hostname = socket.gethostname() + self._register_dispatcher(c.jid, hostname, port) c.retrieve_roster()

1 0

java/code
by StephenHerr 09 Apr '12

09 Apr '12

java/code/webapp/WEB-INF/pages/common/fragments/editarea.jspf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 91e2cc74c8a6e81c7b3faee7866c609c04463449 Author: Stephen Herr <sherr(a)redhat.com> Date: Mon Apr 9 09:44:47 2012 -0400 810871 - Reduce languages available in editarea to only common / useful ones. diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/editarea.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/editarea.jspf index 4cc0e13..c7efbc1 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/editarea.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/editarea.jspf @@ -7,6 +7,8 @@ editAreaLoader.init({ ,allow_resize: "both" ,word_wrap: true ,toolbar: "search, go_to_line, |, undo, redo, |, syntax_selection, |, highlight, reset_highlight, |, help" - ,syntax: "bash" + ,syntax: "bash" + ,syntax_selection_allow: "bash,perl,php,python,ruby,xml" + ,start_highlight: true // default syntax highlighting on }); </script>

1 0

4 commits - backend/satellite_tools
by Milan Zazrivec 06 Apr '12

06 Apr '12

backend/satellite_tools/rhn-db-stats | 36 +++++++++-------- backend/satellite_tools/rhn-db-stats.sgml | 7 --- backend/satellite_tools/rhn-schema-stats | 54 ++++++++++++++++++++------ backend/satellite_tools/rhn-schema-stats.sgml | 7 --- 4 files changed, 63 insertions(+), 41 deletions(-) New commits: commit 406a9e35f36ca3bb5a08e5980d5b96fd88855df9 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Apr 6 13:23:38 2012 +0200 rhn-schema-stats: update manual page connect string is no longer a valid option diff --git a/backend/satellite_tools/rhn-schema-stats.sgml b/backend/satellite_tools/rhn-schema-stats.sgml index e3f7ba2..668b15b 100644 --- a/backend/satellite_tools/rhn-schema-stats.sgml +++ b/backend/satellite_tools/rhn-schema-stats.sgml @@ -23,7 +23,6 @@ utility for querying important Spacewalk / Satellite database schema statistics. <command>&THECOMMAND;</command> <arg choice="opt">-h | --help</arg> <arg choice="req">output-file</arg> - <arg choice="opt">db-conect-string</arg> </cmdsynopsis> </Synopsis> </RefSynopsisDiv> @@ -53,12 +52,6 @@ schema. Ordinarily, is used by spacewalk-debug (satellite-debug), but it can be print the output to stdout.</para> </listitem> </varlistentry> - <varlistentry> - <term>db-connect-string</term> - <listitem> - <para>Connection string to your Oracle database.</para> - </listitem> - </varlistentry> </variablelist> </RefSect1> commit 89a9eae876d01e95c5cfd87c54183a922fca5374 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Apr 6 13:22:41 2012 +0200 rhn-schema-stats: support for PostgreSQL diff --git a/backend/satellite_tools/rhn-schema-stats b/backend/satellite_tools/rhn-schema-stats index 613002d..dfc7873 100755 --- a/backend/satellite_tools/rhn-schema-stats +++ b/backend/satellite_tools/rhn-schema-stats @@ -1,14 +1,12 @@ #!/bin/bash -if [[ $@ =~ "--help|-h" ]] || [ $# -lt 1 -o $# -gt 2 ]; then - echo "Usage: `basename $0` -h | --help | output-file [connect-string]" +if [[ $@ =~ "--help" ]] || [[ $@ =~ "-h" ]] || [ $# -ne 1 ]; then + echo "Usage: `basename $0` -h | --help | output-file" exit fi -connect=$(spacewalk-cfg-get default_db) -[ -n "$2" ] && connect=$2 - -sql=" +if [ $(spacewalk-cfg-get db_backend) = "oracle" ]; then + sql=" set pagesize 4000 linesize 200 set serverout on @@ -58,11 +56,45 @@ where quit; " +elif [ $(spacewalk-cfg-get db_backend) = "postgresql" ]; then + sql=" +select schemaname as schema, + relname as table, + n_live_tup as rows + from pg_stat_user_tables + order by n_live_tup desc; + +select con.conname as name, + con.contype as type, + cl.relname as table, + con.consrc as src + from pg_constraint con, + pg_class cl + where cl.oid = con.conrelid + order by name; + +select + rvi.label, to_char(rvi.created, 'YYYY-MM-DD') as created, + to_char(rvi.modified, 'YYYY-MM-DD') as modified, + rpn.name, + rpe.epoch, + rpe.version, + rpe.release +from + rhnVersionInfo rvi, + rhnPackageName rpn, + rhnPackageEvr rpe +where + rvi.evr_id = rpe.id and + rvi.name_id = rpn.id; +" + +fi + +output=$(echo "$sql" | spacewalk-sql --select-mode -) -if [ "$1" == "-" ]; then - echo "$sql" | sqlplus -S $connect +if [ "$1" = "-" ]; then + echo "$output" else - # sqlplus ... | cat ... is here to fool selinux, since oracle_sqlplus_t - # cannot write just anywhere (via spool ...) - echo "$sql" | sqlplus -S $connect | cat > $1 + echo "$output" > $1 fi commit b4af73bf66e2b58f9f73d1700cec87f367606643 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Apr 6 12:49:48 2012 +0200 rhn-db-stats: update manual page connect string is no longer a valid command line option diff --git a/backend/satellite_tools/rhn-db-stats.sgml b/backend/satellite_tools/rhn-db-stats.sgml index 3ff342c..e26f8a0 100644 --- a/backend/satellite_tools/rhn-db-stats.sgml +++ b/backend/satellite_tools/rhn-db-stats.sgml @@ -24,7 +24,6 @@ utility for querying important database parameters used by <command>&THECOMMAND;</command> <arg choice="opt">-h | --help</arg> <arg choice="req">output-file</arg> - <arg choice="opt">db-conect-string</arg> </cmdsynopsis> </Synopsis> </RefSynopsisDiv> @@ -55,12 +54,6 @@ used by your Satellite / Spacewalk installation. It is used by spacewalk-debug print the output to stdout.</para> </listitem> </varlistentry> - <varlistentry> - <term>db-connect-string</term> - <listitem> - <para>Connection string to your Oracle database.</para> - </listitem> - </varlistentry> </variablelist> </RefSect1> commit 4c775d87c7e0ae268bcb1a8963e3d494351765f2 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Apr 6 12:49:00 2012 +0200 rhn-db-stats: support for PostgreSQL diff --git a/backend/satellite_tools/rhn-db-stats b/backend/satellite_tools/rhn-db-stats index 0895cdd..d6160ad 100755 --- a/backend/satellite_tools/rhn-db-stats +++ b/backend/satellite_tools/rhn-db-stats @@ -1,27 +1,31 @@ #!/bin/sh -if [[ $@ =~ "--help|-h" ]] || [ $# -lt 1 -o $# -gt 2 ]; then - echo "Usage: `basename $0` -h | --help | output-file [connect-string]" - exit +if [[ $@ =~ "-h" ]] || [[ $@ =~ "--help" ]] || [ $# -ne 1 -o $# -gt 1 ]; then + echo "Usage: `basename $0` -h | --help | output-file" + exit fi -connect=$(spacewalk-cfg-get default_db) -[ -n "$2" ] && connect=$2 - -sql=" -set serverout on -set pagesize 2000 linesize 145 -column name_col_plus_show_param format a40 word wrap heading PARAMETER -column value_col_plus_show_param format a90 word wrap heading VALUE +if [ "$(spacewalk-cfg-get db_backend)" = "oracle" ]; then + sql=" +set serverout on; +set pagesize 2000 linesize 145; +column name_col_plus_show_param format a40 word wrap heading PARAMETER; +column value_col_plus_show_param format a90 word wrap heading VALUE; select dbms_stats.get_param('METHOD_OPT') from dual; show parameter; " -if [ "$1" == "-" ]; then - echo "$sql" | sqlplus -S $connect +elif [ "$(spacewalk-cfg-get db_backend)" = "postgresql" ]; then + sql=" +SHOW ALL; +" +fi + +output=$(echo "$sql" | spacewalk-sql --select-mode -) + +if [ "$1" = "-" ]; then + echo "$output" else - # sqlplus ... | cat ... is here to fool selinux, since oracle_sqlplus_t - # cannot write just anywhere (via spool ...) - echo "$sql" | sqlplus -S $connect | cat > $1 + echo "$output" > $1 fi

1 0

selinux/oracle-xe-selinux
by Jan Pazdziora 06 Apr '12

06 Apr '12

selinux/oracle-xe-selinux/oracle-xe.te | 1 + 1 file changed, 1 insertion(+) New commits: commit d3ec414a58f5374f957963aa86656ca3449a81e1 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Apr 6 09:44:51 2012 +0200 Allow Oracle database to ptrace self. Addressing avc: denied { ptrace } for pid=16544 comm="oracle" scontext=root:system_r:oracle_db_t:s0 tcontext=root:system_r:oracle_db_t:s0-s0:c0.c1023 tclass=process Was caused by: Constraint violation. Check policy/constraints. Typically, you just need to add a type attribute to the domain to satisfy the constraint. diff --git a/selinux/oracle-xe-selinux/oracle-xe.te b/selinux/oracle-xe-selinux/oracle-xe.te index 61467d6..af31a47 100644 --- a/selinux/oracle-xe-selinux/oracle-xe.te +++ b/selinux/oracle-xe-selinux/oracle-xe.te @@ -35,3 +35,4 @@ allow oracle_db_t self:process ptrace; term_dontaudit_use_console(oracle_db_t) term_dontaudit_use_console(oracle_tnslsnr_t) +mcs_ptrace_all(oracle_db_t)

1 0

Changes to 'refs/tags/spacewalk-java-1.8.37-1'
by Michael Mraka 06 Apr '12

06 Apr '12

Tag 'spacewalk-java-1.8.37-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-04-06 08:56 +0000 Tagging package [spacewalk-java] version [1.8.37-1] in directory [java/]. Changes since spacecmd-1.8.3-1: Michael Mraka (2): improved performance of repomd generation Automatic commit of package [spacewalk-java] release [1.8.37-1]. --- java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 18 +++++----- java/spacewalk-java.spec | 5 ++ rel-eng/packages/spacewalk-java | 2 - 3 files changed, 14 insertions(+), 11 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Michael Mraka 06 Apr '12

06 Apr '12

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 4ac2f000437efe6d6642e4f8c9bae9ebd376b4ae Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Apr 6 10:56:15 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.37-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index fb6e955..4ee6d87 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.36 +Version: 1.8.37 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Fri Apr 06 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.37-1 +- improved performance of repomd generation + * Thu Apr 05 2012 Stephen Herr <sherr(a)redhat.com> 1.8.36-1 - 804810 - also making inherited virtualization entitlements work correctly in SSM (sherr(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 924c69c..ab22b37 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.36-1 java/ +1.8.37-1 java/

1 0

java/code
by Michael Mraka 06 Apr '12

06 Apr '12

java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 18 +++++----- 1 file changed, 9 insertions(+), 9 deletions(-) New commits: commit f8c71ef4ae14db95ba3650cac3b55f1f9f153c6b Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Apr 6 10:53:25 2012 +0200 improved performance of repomd generation see https://www.redhat.com/archives/spacewalk-list/2012-April/msg00000.html diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml index 3e12f3f..5348278 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml @@ -604,7 +604,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id <mode name="repomdgenerator_capability_files"> <query params="channel_id"> - SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version + SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version FROM rhnPackageFile pkgf, rhnPackageCapability pkgcap, rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id WHERE @@ -618,7 +618,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id <mode name="repomdgenerator_capability_provides"> <query params="channel_id"> - SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense + SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense FROM rhnPackageProvides pkgp, rhnPackageCapability pkgcap, rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id WHERE @@ -632,7 +632,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id <mode name="repomdgenerator_capability_requires"> <query params="channel_id"> - SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense + SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense FROM rhnPackageRequires pkgp, rhnPackageCapability pkgcap, rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id WHERE @@ -646,7 +646,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id <mode name="repomdgenerator_capability_conflicts"> <query params="channel_id"> - SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense + SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense FROM rhnPackageConflicts pkgp, rhnPackageCapability pkgcap, rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id WHERE @@ -660,7 +660,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id <mode name="repomdgenerator_capability_obsoletes"> <query params="channel_id"> - SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense + SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense FROM rhnPackageObsoletes pkgp, rhnPackageCapability pkgcap, rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id WHERE @@ -674,7 +674,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id <mode name="repomdgenerator_capability_recommends"> <query params="channel_id"> - SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense + SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense FROM rhnPackageRecommends pkgp, rhnPackageCapability pkgcap, rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id WHERE @@ -688,7 +688,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id <mode name="repomdgenerator_capability_suggests"> <query params="channel_id"> - SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense + SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense FROM rhnPackageSuggests pkgp, rhnPackageCapability pkgcap, rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id WHERE @@ -702,7 +702,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id <mode name="repomdgenerator_capability_supplements"> <query params="channel_id"> - SELECT /*+first_rows*/ chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense + SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense FROM rhnPackageSupplements pkgp, rhnPackageCapability pkgcap, rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id = chpkg.package_id WHERE @@ -716,7 +716,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id <mode name="repomdgenerator_package_changelog"> <query params="channel_id"> - SELECT /*+first_rows*/ chpkg.package_id, pkglog.time, pkglog.name as author, pkglog.text + SELECT chpkg.package_id, pkglog.time, pkglog.name as author, pkglog.text FROM rhnPackageChangeLog pkglog, rhnChannelPackage chpkg WHERE chpkg.package_id = pkglog.package_id

1 0

Changes to 'refs/tags/spacecmd-1.8.3-1'
by StephenHerr 05 Apr '12

05 Apr '12

Tag 'spacecmd-1.8.3-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-05 18:53 +0000 Tagging package [spacecmd] version [1.8.3-1] in directory [spacecmd/]. Changes since spacewalk-java-1.8.36-1: Stephen Herr (2): 809905 - add option to allow templating for spacecmd kickstarting Automatic commit of package [spacecmd] release [1.8.3-1]. --- rel-eng/packages/spacecmd | 2 +- spacecmd/spacecmd.spec | 6 +++++- spacecmd/src/lib/kickstart.py | 10 +++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) ---

1 0

2 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by StephenHerr 05 Apr '12

05 Apr '12

rel-eng/packages/spacecmd | 2 +- spacecmd/spacecmd.spec | 6 +++++- spacecmd/src/lib/kickstart.py | 10 +++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) New commits: commit a6f9fecf4a9a8eb5f14924d8e134f907b66e163a Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Apr 5 14:53:04 2012 -0400 Automatic commit of package [spacecmd] release [1.8.3-1]. diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd index 8aee942..308f552 100644 --- a/rel-eng/packages/spacecmd +++ b/rel-eng/packages/spacecmd @@ -1 +1 @@ -1.8.2-1 spacecmd/ +1.8.3-1 spacecmd/ diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec index ca8a761..dbdf696 100644 --- a/spacecmd/spacecmd.spec +++ b/spacecmd/spacecmd.spec @@ -4,7 +4,7 @@ %endif Name: spacecmd -Version: 1.8.2 +Version: 1.8.3 Release: 1%{?dist} Summary: Command-line interface to Spacewalk and Satellite servers @@ -61,6 +61,10 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py %doc %{_mandir}/man1/spacecmd.1.gz %changelog +* Thu Apr 05 2012 Stephen Herr <sherr(a)redhat.com> 1.8.3-1 +- 809905 - add option to allow templating for spacecmd kickstarting + (sherr(a)redhat.com) + * Thu Mar 29 2012 Steven Hardy <shardy(a)redhat.com> 1.8.2-1 - spacecmd : softwarechannel_clone avoid ISE on duplicate name (shardy(a)redhat.com) commit b9a232dd1f79ab46e23d0654189bf4fd0009f5fb Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Apr 5 14:51:49 2012 -0400 809905 - add option to allow templating for spacecmd kickstarting diff --git a/spacecmd/src/lib/kickstart.py b/spacecmd/src/lib/kickstart.py index 935a23f..fb51df5 100644 --- a/spacecmd/src/lib/kickstart.py +++ b/spacecmd/src/lib/kickstart.py @@ -1638,6 +1638,7 @@ def do_kickstart_addscript(self, args): options = [ Option('-p', '--profile', action='store'), Option('-e', '--execution-time', action='store'), Option('-c', '--chroot', action='store_true'), + Option('-t', '--template', action='store_true'), Option('-i', '--interpreter', action='store'), Option('-f', '--file', action='store') ] @@ -1668,6 +1669,11 @@ def do_kickstart_addscript(self, args): else: options.chroot = True + if re.match('n', options.template, re.I): + options.template = False + else: + options.template = True + if re.match('pre', options.execution_time, re.I): options.execution_time = 'pre' else: @@ -1698,6 +1704,7 @@ def do_kickstart_addscript(self, args): print 'Profile Name: %s' % options.profile print 'Execution Time: %s' % options.execution_time print 'Chroot: %s' % options.chroot + print 'Template: %s' % options.template print 'Interpreter: %s' % options.interpreter print 'Contents:' print options.contents @@ -1709,7 +1716,8 @@ def do_kickstart_addscript(self, args): options.contents, options.interpreter, options.execution_time, - options.chroot) + options.chroot, + options.template) ####################

1 0

Changes to 'refs/tags/spacewalk-java-1.8.36-1'
by StephenHerr 05 Apr '12

05 Apr '12

Tag 'spacewalk-java-1.8.36-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-05 18:07 +0000 Tagging package [spacewalk-java] version [1.8.36-1] in directory [java/]. Changes since spacewalk-setup-1.8.4-1: Stephen Herr (2): 804810 - also making inherited virtualization entitlements work correctly in SSM Automatic commit of package [spacewalk-java] release [1.8.36-1]. --- java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java | 20 ++++++++++----- java/spacewalk-java.spec | 6 +++- rel-eng/packages/spacewalk-java | 2 - 3 files changed, 20 insertions(+), 8 deletions(-) ---

1 0

2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by StephenHerr 05 Apr '12

05 Apr '12

java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java | 20 ++++++++++----- java/spacewalk-java.spec | 6 +++- rel-eng/packages/spacewalk-java | 2 - 3 files changed, 20 insertions(+), 8 deletions(-) New commits: commit 1b942beda1995fa3e0826fefbdb937ec78da65f8 Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Apr 5 14:07:45 2012 -0400 Automatic commit of package [spacewalk-java] release [1.8.36-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index efa70e1..fb6e955 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.35 +Version: 1.8.36 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,10 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Apr 05 2012 Stephen Herr <sherr(a)redhat.com> 1.8.36-1 +- 804810 - also making inherited virtualization entitlements work correctly in + SSM (sherr(a)redhat.com) + * Thu Apr 05 2012 Jan Pazdziora 1.8.35-1 - 809897 - using the evr_t_as_vre_simple. - adding jdom dependency (tlestach(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index fd97354..924c69c 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.35-1 java/ +1.8.36-1 java/ commit 23b4958b010f710dbd0bafb6e65aca89b96439bb Author: Stephen Herr <sherr(a)redhat.com> Date: Thu Apr 5 14:07:35 2012 -0400 804810 - also making inherited virtualization entitlements work correctly in SSM diff --git a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java index de6e3e5..39fdd1a 100644 --- a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java +++ b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -65,7 +66,7 @@ public class SsmManager { * channels that are safe to subscribe it to */ public static Map<Long, ChannelActionDAO> verifyChildEntitlements( - User user, Map<Long, ChannelActionDAO> sysMapping, List<Channel> allChannels) { + User user, Map<Long, ChannelActionDAO> sysMapping, List<Channel> allChannels) { //Load all of the channels in a map for easy lookup Map<Long, Channel> idToChan = new HashMap<Long, Channel>(); @@ -85,14 +86,17 @@ public class SsmManager { // a more accurate representation of how many entitlements are left rather than // always loading the static value from the DB. Map<Channel, Long> channelToAvailableEntitlements = - new HashMap<Channel, Long>(allChannels.size()); + new HashMap<Channel, Long>(allChannels.size()); Map<Channel, Long> channelToAvailableFteEntitlements = new HashMap<Channel, Long>(allChannels.size()); for (Server server : servers) { Long sysid = server.getId(); - Set<Long> chanIds = sysMapping.get(sysid).getSubscribeChannelIds(); + Set<Long> chanIds = new HashSet<Long>(); + if (sysMapping.get(sysid) != null) { + chanIds = sysMapping.get(sysid).getSubscribeChannelIds(); + } //Use an iterator so i can remove from the set Iterator<Long> it = chanIds.iterator(); while (it.hasNext()) { @@ -103,7 +107,7 @@ public class SsmManager { if (availableEntitlements == null) { availableEntitlements = - ChannelManager.getAvailableEntitlements(user.getOrg(), channel); + ChannelManager.getAvailableEntitlements(user.getOrg(), channel); channelToAvailableEntitlements.put(channel, availableEntitlements); } if (availableFteEntitlements == null) { @@ -125,7 +129,11 @@ public class SsmManager { // First try to consume an FTE entitlement, then try regular, // then remove the system - if (availableFteEntitlements > 0 && + if (ChannelManager + .isChannelFreeForSubscription(server, channel)) { + // do nothing, server gets this channel for free + } + else if (availableFteEntitlements > 0 && SystemManager.isServerFveEligible(server)) { availableFteEntitlements -= 1; channelToAvailableEntitlements.put(channel, availableFteEntitlements); @@ -167,7 +175,7 @@ public class SsmManager { * @param sysMapping a collection of ChannelActionDAOs */ public static void performChannelActions(User user, - Collection<ChannelActionDAO> sysMapping) { + Collection<ChannelActionDAO> sysMapping) { for (ChannelActionDAO system : sysMapping) { for (Long cid : system.getSubscribeChannelIds()) {

1 0

Changes to 'refs/tags/spacewalk-setup-1.8.4-1'
by Jan Pazdziora 05 Apr '12

05 Apr '12

Tag 'spacewalk-setup-1.8.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-05 14:29 +0000 Tagging package [spacewalk-setup] version [1.8.4-1] in directory [spacewalk/setup/]. Changes since spacewalk-web-1.8.8-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-setup] release [1.8.4-1]. --- rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/spacewalk-setup.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages spacewalk/setup
by Jan Pazdziora 05 Apr '12

05 Apr '12

rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/spacewalk-setup.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 28a2365088c6e2d68f1218b14afa8d6ddbc8dea9 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 5 16:29:39 2012 +0200 Automatic commit of package [spacewalk-setup] release [1.8.4-1]. diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index 3ac4665..b3beab2 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -1.8.3-1 spacewalk/setup/ +1.8.4-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index d220921..07544a3 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup -Version: 1.8.3 +Version: 1.8.4 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk @@ -106,6 +106,9 @@ rm -rf %{buildroot} %{_mandir}/man8/spacewalk-make-mount-points* %changelog +* Thu Apr 05 2012 Jan Pazdziora 1.8.4-1 +- fixed clearing db for postgresql installation (michael.mraka(a)redhat.com) + * Mon Mar 19 2012 Jan Pazdziora 1.8.3-1 - rhn-config-satellite.pl does not like to be invoked with no --option specified.

1 0

Changes to 'refs/tags/spacewalk-web-1.8.8-1'
by Jan Pazdziora 05 Apr '12

05 Apr '12

Tag 'spacewalk-web-1.8.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-05 14:29 +0000 Tagging package [spacewalk-web] version [1.8.8-1] in directory [web/]. Changes since spacewalk-backend-1.8.12-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-web] release [1.8.8-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora 05 Apr '12

05 Apr '12

rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 4545d9674123dfaa0915ea799f29c24055da827e Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 5 16:29:09 2012 +0200 Automatic commit of package [spacewalk-web] release [1.8.8-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 3d0ced7..c1b7181 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -1.8.7-1 web/ +1.8.8-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 040b08f..9115ee2 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 1.8.7 +Version: 1.8.8 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -254,6 +254,10 @@ rm -rf $RPM_BUILD_ROOT # $Id$ %changelog +* Thu Apr 05 2012 Jan Pazdziora 1.8.8-1 +- Fix naming of cloned errata to replace only the first 2 chars + (tlestach(a)redhat.com) + * Tue Apr 03 2012 Jan Pazdziora 1.8.7-1 - 806439 - Changing perl sitenav too (sherr(a)redhat.com)

1 0

Changes to 'refs/tags/spacewalk-backend-1.8.12-1'
by Jan Pazdziora 05 Apr '12

05 Apr '12

Tag 'spacewalk-backend-1.8.12-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-05 14:20 +0000 Tagging package [spacewalk-backend] version [1.8.12-1] in directory [backend/]. Changes since spacewalk-java-1.8.35-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-backend] release [1.8.12-1]. --- backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora 05 Apr '12

05 Apr '12

backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 70156c0e50425aea052acd11e0050056fbfc6387 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 5 16:20:09 2012 +0200 Automatic commit of package [spacewalk-backend] release [1.8.12-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 618fe0f..2ca49a3 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.8.11 +Version: 1.8.12 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -688,6 +688,9 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Thu Apr 05 2012 Jan Pazdziora 1.8.12-1 +- 809936 - we need to insert NULLs to avoid vn_rhnserverhistory_details. + * Tue Apr 03 2012 Jan Pazdziora 1.8.11-1 - Fixing typo in spacewalk-remove-channel man page. diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index bccbfcb..882ce41 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.8.11-1 backend/ +1.8.12-1 backend/

1 0

Changes to 'refs/tags/spacewalk-java-1.8.35-1'
by Jan Pazdziora 05 Apr '12

05 Apr '12

Tag 'spacewalk-java-1.8.35-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-05 14:19 +0000 Tagging package [spacewalk-java] version [1.8.35-1] in directory [java/]. Changes since spacewalk-utils-1.8.4-1: Jan Pazdziora (6): Add ACL to VerifyPackages to match the ACL on the .jsp referencing it. 701893 - do not show the Schedule Deploy Action and Schedule System Comparison links in the left pane -- the right pane has them with correct ACLs. Fixing the order of action's child elements. 809897 - using the evr_t_as_vre_simple. 809936 - we need to insert NULLs to avoid vn_rhnserverhistory_details. Automatic commit of package [spacewalk-java] release [1.8.35-1]. Michael Mraka (1): fixed clearing db for postgresql installation Tomas Lestach (1): adding jdom dependency --- backend/server/rhnServer/server_history.py | 5 +++ java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml | 2 - java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java | 10 +------ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 8 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 8 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 4 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 8 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 8 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 8 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 8 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 8 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 8 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 8 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 8 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 8 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 8 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 8 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 8 +++--- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 6 ++-- java/code/webapp/WEB-INF/struts-config.xml | 4 +++ java/spacewalk-java.spec | 13 +++++++++- rel-eng/packages/spacewalk-java | 2 - spacewalk/setup/lib/Spacewalk/Setup.pm | 4 +-- 23 files changed, 87 insertions(+), 75 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora 05 Apr '12

05 Apr '12

java/spacewalk-java.spec | 12 +++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) New commits: commit 2f072d38565edbe3063d78213480f029437ce3dd Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 5 16:19:32 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.35-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 4566617..efa70e1 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.34 +Version: 1.8.35 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -605,6 +605,16 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Apr 05 2012 Jan Pazdziora 1.8.35-1 +- 809897 - using the evr_t_as_vre_simple. +- adding jdom dependency (tlestach(a)redhat.com) +- Fixing the order of action's child elements. +- 701893 - do not show the Schedule Deploy Action and Schedule System + Comparison links in the left pane -- the right pane has them with correct + ACLs. +- Add ACL to VerifyPackages to match the ACL on the .jsp referencing it. +- fix typo (tlestach(a)redhat.com) + * Wed Apr 04 2012 Stephen Herr <sherr(a)redhat.com> 1.8.34-1 - 809868 - Make automatically-scheduled tasks visible on Failed and Archived tabs (sherr(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index e1de6a9..fd97354 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.34-1 java/ +1.8.35-1 java/

1 0

backend/server
by Jan Pazdziora 05 Apr '12

05 Apr '12

backend/server/rhnServer/server_history.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 8fd3bffea46759e33565ddc647c2e0e92f61de14 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 5 16:12:49 2012 +0200 809936 - we need to insert NULLs to avoid vn_rhnserverhistory_details. Addressing IntegrityError: new row for relation "rhnserverhistory" violates check constraint "vn_rhnserverhistory_details" diff --git a/backend/server/rhnServer/server_history.py b/backend/server/rhnServer/server_history.py index 84407c6..5dec16f 100644 --- a/backend/server/rhnServer/server_history.py +++ b/backend/server/rhnServer/server_history.py @@ -29,7 +29,10 @@ class History: def add_history(self, summary, details = ""): """ Add a history event to the server. """ log_debug(4, summary) - self.__h.append((summary[:MAX_SUMMARY], details[:MAX_DETAILS])) + if details == '': + self.__h.append((summary[:MAX_SUMMARY], None)) + else: + self.__h.append((summary[:MAX_SUMMARY], details[:MAX_DETAILS])) def save_history_byid(self, server_id): log_debug(3, server_id, "%d history events" % len(self.__h))

1 0

java/code
by Jan Pazdziora 05 Apr '12

05 Apr '12

java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a041d5642d12a6b89d0c1e8fe6a34bf65081051f Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 5 15:32:28 2012 +0200 809897 - using the evr_t_as_vre_simple. Addressing ERROR: cross-database references are not implemented: pe.evr.as_vre_simple STATEMENT: SELECT PN.name || '-' || PE.evr.as_vre_simple() AS NVRE, PA.label as arch FROM rhnServerProfilePackage SPP LEFT JOIN rhnPackageArch PA ON SPP.package_arch_id = PA.id INNER JOIN rhnPackageName PN ON SPP.name_id = PN.id INNER JOIN rhnPackageEVR PE ON SPP.evr_id = PE.id WHERE SPP.server_profile_id = $1 ORDER BY UPPER(PN.name), PE.evr ERROR: current transaction is aborted, commands ignored until end of transaction block diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml index b003a47..7445571 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/profile_queries.xml @@ -15,7 +15,7 @@ ORDER BY UPPER(SP.name) <mode name="profile_package_overview" class="com.redhat.rhn.frontend.dto.ProfilePackageOverviewDto"> <query params="prid"> -SELECT PN.name || '-' || PE.evr.as_vre_simple() AS NVRE, +SELECT PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS NVRE, PA.label as arch FROM rhnServerProfilePackage SPP LEFT JOIN rhnPackageArch PA ON SPP.package_arch_id = PA.id

1 0

java/spacewalk-java.spec
by Tomas Lestach 05 Apr '12

05 Apr '12

java/spacewalk-java.spec | 1 + 1 file changed, 1 insertion(+) New commits: commit f151419d6024c2d406a87e526fd00fcf2c656d7d Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Apr 5 14:59:37 2012 +0200 adding jdom dependency required on RHEL5 diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 2652f47..4566617 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -58,6 +58,7 @@ Requires: jakarta-commons-fileupload Requires: jakarta-commons-io Requires: jakarta-taglibs-standard Requires: jcommon +Requires: jdom Requires: jpam Requires: jta Requires: log4j

1 0

spacewalk/setup
by Michael Mraka 05 Apr '12

05 Apr '12

spacewalk/setup/lib/Spacewalk/Setup.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a8a08808522307529218babfd8beb2371b3abd54 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Apr 5 14:45:51 2012 +0200 fixed clearing db for postgresql installation diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index c9565a1..4077275 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -1004,8 +1004,8 @@ sub postgresql_clear_db { print loc("** Database: Shutting down spacewalk services that may be using DB.\n"); - # The --exclude=oracle is needed for embedded database Satellites. - system_debug('/usr/sbin/spacewalk-service', '--exclude=oracle', 'stop'); + # The --exclude=postgresql is needed for embedded database Satellites. + system_debug('/usr/sbin/spacewalk-service', '--exclude=postgresql', 'stop'); print loc("** Database: Services stopped. Clearing DB.\n");

1 0

java/code
by Jan Pazdziora 05 Apr '12

05 Apr '12

java/code/webapp/WEB-INF/struts-config.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 8ede6d8a37a1910289ce942f97ec8c794f5e12bf Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 5 14:12:07 2012 +0200 Fixing the order of action's child elements. Addressing org.xml.sax.SAXParseException; systemId: jndi:/localhost/rhn/WEB-INF/struts-config.xml; lineNumber: 2917; columnNumber: 14; The content of element type "action" must match "(icon?,display-name?,description?,set-property*,exception*,forward*)". diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 266e657..9c7bb6e 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -2905,15 +2905,15 @@ type="com.redhat.rhn.frontend.action.rhnpackage.VerifyPackageSetupAction" className="com.redhat.rhn.frontend.struts.RhnActionMapping"> <set-property property="postRequiredIfSubmitted" value="true" /> + <set-property property="acls" + value="system_feature(ftr_package_verify); client_capable(packges.verify) or client_capable(packages.verify)"/> + <set-property property="mixins" + value="com.redhat.rhn.common.security.acl.SystemAclHandler"/> <forward name="default" path="/WEB-INF/pages/systems/details/packages/verifypkgs.jsp"/> <forward name="confirm" path="/systems/details/packages/VerifyConfirm.do" redirect="true" /> - <set-property property="acls" - value="system_feature(ftr_package_verify); client_capable(packges.verify) or client_capable(packages.verify)"/> - <set-property property="mixins" - value="com.redhat.rhn.common.security.acl.SystemAclHandler"/> </action> <action path="/systems/details/packages/VerifyConfirm"

1 0

java/code
by Jan Pazdziora 05 Apr '12

05 Apr '12

java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java | 10 ++-------- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 8 ++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 8 ++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 4 ++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 8 ++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 8 ++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 8 ++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 8 ++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 8 ++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 8 ++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 8 ++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 8 ++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 8 ++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 8 ++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 8 ++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 8 ++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 6 +++--- 17 files changed, 63 insertions(+), 69 deletions(-) New commits: commit 3a51ef4f80bafeac4f53b3c8f1f43e65d6a990a0 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Thu Apr 5 13:58:34 2012 +0200 701893 - do not show the Schedule Deploy Action and Schedule System Comparison links in the left pane -- the right pane has them with correct ACLs. diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java index d4cb3d5..7acfa4b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java @@ -180,13 +180,10 @@ public class OverviewAction extends RhnAction { ActionFactory.TYPE_CONFIGFILES_DIFF, server); if (sysCompare == null) { - String url = COMPARE_FILES_URL + "?sid=" + server.getId(); - Object [] params = new Object[] { url }; request.setAttribute(DIFF_TIME_MESSAGE, ""); request.setAttribute(DIFF_ACTION_MESSAGE, - service.getMessage("sdc.config.diff.noaction", - params)); + service.getMessage("sdc.config.diff.noaction")); } else { request.setAttribute(DIFF_TIME_MESSAGE, @@ -223,13 +220,10 @@ public class OverviewAction extends RhnAction { server); if (ca == null) { - String url = DEPLOY_FILES_URL + "?sid=" + server.getId(); - Object [] params = new Object[] { url }; request.setAttribute(DEPLOYMENT_TIME_MESSAGE, ""); request.setAttribute(DEPLOYMENT_DETAILS_MESSAGE, - service.getMessage("sdc.config.deploy.noaction", - params)); + service.getMessage("sdc.config.deploy.noaction")); } else { 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 f5d8b65..3914810 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 @@ -6674,8 +6674,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> - <target>স্থাপনা কর্ম সমাপ্ত হয়নি। [<a href="{0}">স্থাপনার কর্ম নির্ধারণ করুন</a>]</target></trans-unit> + <source>No deploy action completed.</source> + <target>স্থাপনা কর্ম সমাপ্ত হয়নি।</target></trans-unit> <trans-unit id="sdc.config.deploy.failure"> <source>All file and/or directory ({0}) deployments failed. [<a href="{1}">View Details</a>]</source> @@ -6691,8 +6691,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> - <target>সিস্টেমের তুলনামূলক কোনো পরীক্ষণ সমাপ্ত হয়নি। [<a href="{0}">সিস্টেমের তুলনামূলক পরীক্ষণ নির্ধারণ করুন</a>]</target></trans-unit> + <source>No system comparisons completed.</source> + <target>সিস্টেমের তুলনামূলক কোনো পরীক্ষণ সমাপ্ত হয়নি।</target></trans-unit> 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 3ac0df3..87a35e3 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 @@ -6699,8 +6699,8 @@ Folgen Sie dieser URL f&uuml;r die vollst&auml;ndige Liste inaktiver Sys <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> - <target>Keine Einsatz-Aktion abgeschlossen. [<a href="{0}">Einsatz-Aktion planen</a>]</target></trans-unit> + <source>No deploy action completed.</source> + <target>Keine Einsatz-Aktion abgeschlossen.</target></trans-unit> <trans-unit id="sdc.config.deploy.failure"> <source>All file and/or directory ({0}) deployments failed. [<a href="{1}">View Details</a>]</source> @@ -6716,8 +6716,8 @@ Folgen Sie dieser URL f&uuml;r die vollst&auml;ndige Liste inaktiver Sys <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> - <target>Keine Systemabgleiche abgeschlossen. [<a href="{0}">Systemabgleich planen</a>]</target></trans-unit> + <source>No system comparisons completed.</source> + <target>Keine Systemabgleiche abgeschlossen.</target></trans-unit> 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 e72f19a..fa0f59a 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 @@ -6765,7 +6765,7 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> + <source>No deploy action completed.</source> </trans-unit> <trans-unit id="sdc.config.deploy.failure"> @@ -6782,7 +6782,7 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> + <source>No system comparisons completed.</source> </trans-unit> 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 1a2a75a..43eff67 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 @@ -6693,8 +6693,8 @@ Vaya a esta dirección para ver la lista completa de sistemas inactivos: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> - <target>Ninguna acción de implementación completada. [<a href="{0}">Acción de implementación programada</a>]</target></trans-unit> + <source>No deploy action completed.</source> + <target>Ninguna acción de implementación completada.</target></trans-unit> <trans-unit id="sdc.config.deploy.failure"> <source>All file and/or directory ({0}) deployments failed. [<a href="{1}">View Details</a>]</source> @@ -6710,8 +6710,8 @@ Vaya a esta dirección para ver la lista completa de sistemas inactivos: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> - <target>No se ha completado ninguna comparación de sistema. [<a href="{0}">Comparación de sistema programada</a>]</target></trans-unit> + <source>No system comparisons completed.</source> + <target>No se ha completado ninguna comparación de sistema.</target></trans-unit> 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 5ea4771..758ccc7 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 @@ -6695,8 +6695,8 @@ Suivez cet url pour obtenir la liste complète des systèmes inactifs : <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> - <target>Aucune action de déploiement terminée. [<a href="{0}">Programmer une action de déploiement</a>]</target></trans-unit> + <source>No deploy action completed.</source> + <target>Aucune action de déploiement terminée.</target></trans-unit> <trans-unit id="sdc.config.deploy.failure"> <source>All file and/or directory ({0}) deployments failed. [<a href="{1}">View Details</a>]</source> @@ -6712,8 +6712,8 @@ Suivez cet url pour obtenir la liste complète des systèmes inactifs : <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> - <target>Aucune comparaison de systèmes n'est terminée. [<a href="{0}">Programmer la comparaison de systèmes</a>]</target></trans-unit> + <source>No system comparisons completed.</source> + <target>Aucune comparaison de systèmes n'est terminée.</target></trans-unit> 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 3d73cb5..53c5497 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 @@ -6668,8 +6668,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> - <target>કોઈ જમાવટ ક્રિયા સમાપ્ત થઈ નહિં. [<a href="{0}">જમાવટ ક્રિયા સુનિશ્ચિત કરો</a>]</target></trans-unit> + <source>No deploy action completed.</source> + <target>કોઈ જમાવટ ક્રિયા સમાપ્ત થઈ નહિં.</target></trans-unit> <trans-unit id="sdc.config.deploy.failure"> <source>All file and/or directory ({0}) deployments failed. [<a href="{1}">View Details</a>]</source> @@ -6685,8 +6685,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> - <target>કોઈ સિસ્ટમ સરખામણીઓ સમાપ્ત થઈ નહિં. [<a href="{0}">સિસ્ટમ સરખામણી સુનિશ્ચિત કરો</a>]</target></trans-unit> + <source>No system comparisons completed.</source> + <target>કોઈ સિસ્ટમ સરખામણીઓ સમાપ્ત થઈ નહિં.</target></trans-unit> 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 3bb027e..5a8220e 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 @@ -6668,8 +6668,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> - <target>कोई तैनाती क्रिया पूर्ण नहीं. [<a href="{0}">तैनाती क्रिया नियोजित करें</a>]</target></trans-unit> + <source>No deploy action completed.</source> + <target>कोई तैनाती क्रिया पूर्ण नहीं.</target></trans-unit> <trans-unit id="sdc.config.deploy.failure"> <source>All file and/or directory ({0}) deployments failed. [<a href="{1}">View Details</a>]</source> @@ -6685,8 +6685,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> - <target>कोई सिस्टम तुलना नहीं की गई. [<a href="{0}">सिस्टम तुलना नियोजित करें</a>]</target></trans-unit> + <source>No system comparisons completed.</source> + <target>कोई सिस्टम तुलना नहीं की गई.</target></trans-unit> 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 a2ab227..b7e04ad 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 @@ -6692,8 +6692,8 @@ Seguite l'url sotto riportato per visualizzare l'elenco completo di sistemi inat <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> - <target>Nessuna implementazione completata. [<a href="{0}">Programma implementazione</a>]</target></trans-unit> + <source>No deploy action completed.</source> + <target>Nessuna implementazione completata.</target></trans-unit> <trans-unit id="sdc.config.deploy.failure"> <source>All file and/or directory ({0}) deployments failed. [<a href="{1}">View Details</a>]</source> @@ -6709,8 +6709,8 @@ Seguite l'url sotto riportato per visualizzare l'elenco completo di sistemi inat <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> - <target>Non è stato completato alcun confronto del sistema. [<a href="{0}">Programma confronto del sistema</a>]</target></trans-unit> + <source>No system comparisons completed.</source> + <target>Non è stato completato alcun confronto del sistema.</target></trans-unit> 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 8f229b9..b0a8495 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 @@ -6692,8 +6692,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> - <target>配備のアクションは完了していません。 [<a href="{0}">配備アクションのスケジュール</a>]</target></trans-unit> + <source>No deploy action completed.</source> + <target>配備のアクションは完了していません。</target></trans-unit> <trans-unit id="sdc.config.deploy.failure"> <source>All file and/or directory ({0}) deployments failed. [<a href="{1}">View Details</a>]</source> @@ -6709,8 +6709,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> - <target>システムの比較は完了していません。 [<a href="{0}">システムの比較をスケジュール</a>]</target></trans-unit> + <source>No system comparisons completed.</source> + <target>システムの比較は完了していません。</target></trans-unit> 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 10032be..7361929 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 @@ -6668,8 +6668,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> - <target>디플로이 작업이 완료되지 않음. [<a href="{0}">디플로이 작업 스케줄함</a>]</target></trans-unit> + <source>No deploy action completed.</source> + <target>디플로이 작업이 완료되지 않음.</target></trans-unit> <trans-unit id="sdc.config.deploy.failure"> <source>All file and/or directory ({0}) deployments failed. [<a href="{1}">View Details</a>]</source> @@ -6685,8 +6685,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> - <target>시스템 비교 작업이 완료되지 않음. [<a href="{0}">시스템 비교 작업 스케줄함</a>]</target></trans-unit> + <source>No system comparisons completed.</source> + <target>시스템 비교 작업이 완료되지 않음.</target></trans-unit> 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 ac1f76c..8b47cf5 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 @@ -6670,8 +6670,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> - <target>ਕੋਈ ਸ਼ਾਮਿਲ ਕਾਰਵਾਈ ਮੁਕੰਮਲ ਨਹੀਂ ਹੋਈ। [<a href="{0}">ਸ਼ਾਮਿਲ ਕਾਰਵਾਈ ਤਹਿ ਕਰੋ</a>]</target></trans-unit> + <source>No deploy action completed.</source> + <target>ਕੋਈ ਸ਼ਾਮਿਲ ਕਾਰਵਾਈ ਮੁਕੰਮਲ ਨਹੀਂ ਹੋਈ।</target></trans-unit> <trans-unit id="sdc.config.deploy.failure"> <source>All file and/or directory ({0}) deployments failed. [<a href="{1}">View Details</a>]</source> @@ -6687,8 +6687,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> - <target>ਕੋਈ ਸਿਸਟਮ ਤੁਲਨਾ ਮੁਕੰਮਲ ਨਹੀਂ ਹੋਈ। [<a href="{0}">ਸਿਸਟਮ ਤੁਲਨਾ ਤਹਿ ਕਰੋ</a>]</target></trans-unit> + <source>No system comparisons completed.</source> + <target>ਕੋਈ ਸਿਸਟਮ ਤੁਲਨਾ ਮੁਕੰਮਲ ਨਹੀਂ ਹੋਈ।</target></trans-unit> 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 02cabcf..a6b543d 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 @@ -6680,8 +6680,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> - <target>Nenhuma ação de implementação completa. [<a href="{0}">Agendar Ação de Implementação</a>]</target></trans-unit> + <source>No deploy action completed.</source> + <target>Nenhuma ação de implementação completa.</target></trans-unit> <trans-unit id="sdc.config.deploy.failure"> <source>All file and/or directory ({0}) deployments failed. [<a href="{1}">View Details</a>]</source> @@ -6697,8 +6697,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> - <target>Nenhuma comparação de sistema concluída. [<a href="{0}">Agendar Comparação de Sistema</a>]</target></trans-unit> + <source>No system comparisons completed.</source> + <target>Nenhuma comparação de sistema concluída.</target></trans-unit> 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 2e2300f..f28bca1 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 @@ -6668,8 +6668,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> - <target>Нет завершенных действий развертывания. [<a href="{0}">Назначить действие развертывания</a>]</target></trans-unit> + <source>No deploy action completed.</source> + <target>Нет завершенных действий развертывания.</target></trans-unit> <trans-unit id="sdc.config.deploy.failure"> <source>All file and/or directory ({0}) deployments failed. [<a href="{1}">View Details</a>]</source> @@ -6685,8 +6685,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> - <target>Нет завершенных сравнений систем. [<a href="{0}">Назначить сравнение системы</a>]</target></trans-unit> + <source>No system comparisons completed.</source> + <target>Нет завершенных сравнений систем.</target></trans-unit> 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 61e4173..2682ac8 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 @@ -6668,8 +6668,8 @@ url பின்பற்றி செயலிழக்கப்பட்ட <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> - <target>வரிசைப்படுத்தும் செயல் எதுவும் முடிக்கப்படவில்லை. [<a href="{0}">வரிசைப்படுத்தும் செயலைத் திட்டமிடவும்</a>]</target></trans-unit> + <source>No deploy action completed.</source> + <target>வரிசைப்படுத்தும் செயல் எதுவும் முடிக்கப்படவில்லை.</target></trans-unit> <trans-unit id="sdc.config.deploy.failure"> <source>All file and/or directory ({0}) deployments failed. [<a href="{1}">View Details</a>]</source> @@ -6685,8 +6685,8 @@ url பின்பற்றி செயலிழக்கப்பட்ட <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> - <target>கணினி ஒப்பீடுகள் எதுவும் முடியவில்லை. [<a href="{0}">கணினி ஒப்பீட்டை திட்டமிடவும்</a>]</target></trans-unit> + <source>No system comparisons completed.</source> + <target>கணினி ஒப்பீடுகள் எதுவும் முடியவில்லை.</target></trans-unit> 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 6087951..597a61b 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 @@ -6693,8 +6693,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> - <target>未完成部署动作。 [<a href="{0}">预定部署动作</a>]</target></trans-unit> + <source>No deploy action completed.</source> + <target>未完成部署动作。</target></trans-unit> <trans-unit id="sdc.config.deploy.failure"> <source>All file and/or directory ({0}) deployments failed. [<a href="{1}">View Details</a>]</source> @@ -6710,8 +6710,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> - <target>未完成系统比较。 [<a href="{0}">预定系统比较</a>]</target></trans-unit> + <source>No system comparisons completed.</source> + <target>未完成系统比较。</target></trans-unit> 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 a96f406..d670aef 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 @@ -6667,7 +6667,7 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.deploy.noaction"> - <source>No deploy action completed. [<a href="{0}">Schedule Deploy Action</a>]</source> + <source>No deploy action completed.</source> <target>無建置動作被完成。「<a href="{0}">排程建置動作</a>」</target></trans-unit> <trans-unit id="sdc.config.deploy.failure"> @@ -6684,8 +6684,8 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/configuration/Overview.do</context> </context-group> <trans-unit id="sdc.config.diff.noaction"> - <source>No system comparisons completed. [<a href="{0}">Schedule System Comparison</a>]</source> - <target>沒有完成的系統比較。「<a href="{0}">排程系統比較</a>」</target></trans-unit> + <source>No system comparisons completed.</source> + <target>沒有完成的系統比較。</target></trans-unit>

1 0

java/code
by Jan Pazdziora 05 Apr '12

05 Apr '12

java/code/webapp/WEB-INF/struts-config.xml | 4 ++++ 1 file changed, 4 insertions(+) New commits: commit cd81fdb0b95f972d85a9967bbb4f2366ef91414f Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Apr 4 14:06:16 2012 +0200 Add ACL to VerifyPackages to match the ACL on the .jsp referencing it. diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 1d9d72f..266e657 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -2910,6 +2910,10 @@ <forward name="confirm" path="/systems/details/packages/VerifyConfirm.do" redirect="true" /> + <set-property property="acls" + value="system_feature(ftr_package_verify); client_capable(packges.verify) or client_capable(packages.verify)"/> + <set-property property="mixins" + value="com.redhat.rhn.common.security.acl.SystemAclHandler"/> </action> <action path="/systems/details/packages/VerifyConfirm"

1 0

Changes to 'refs/tags/spacewalk-utils-1.8.4-1'
by Michael Mraka 05 Apr '12

05 Apr '12

Tag 'spacewalk-utils-1.8.4-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-04-05 10:07 +0000 Tagging package [spacewalk-utils] version [1.8.4-1] in directory [utils/]. Changes since spacewalk-java-1.8.34-1: Michael Mraka (2): made new pylint on Fedora 16 happy Automatic commit of package [spacewalk-utils] release [1.8.4-1]. Tomas Lestach (1): fix typo --- java/code/webapp/WEB-INF/struts-config.xml | 2 +- rel-eng/packages/spacewalk-utils | 2 +- utils/depsolver.py | 2 +- utils/spacewalk-utils.spec | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) ---

1 0

2 commits - rel-eng/packages utils/depsolver.py utils/spacewalk-utils.spec
by Michael Mraka 05 Apr '12

05 Apr '12

rel-eng/packages/spacewalk-utils | 2 +- utils/depsolver.py | 2 +- utils/spacewalk-utils.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) New commits: commit a81746ae124d7f711c835149716b598f1d5a4b09 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Apr 5 12:07:58 2012 +0200 Automatic commit of package [spacewalk-utils] release [1.8.4-1]. diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils index 42471d6..7c96353 100644 --- a/rel-eng/packages/spacewalk-utils +++ b/rel-eng/packages/spacewalk-utils @@ -1 +1 @@ -1.8.3-1 utils/ +1.8.4-1 utils/ diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec index c0af1e3..473cbaf 100644 --- a/utils/spacewalk-utils.spec +++ b/utils/spacewalk-utils.spec @@ -1,7 +1,7 @@ %define rhnroot %{_prefix}/share/rhn Name: spacewalk-utils -Version: 1.8.3 +Version: 1.8.4 Release: 1%{?dist} Summary: Utilities that may be run against a Spacewalk server. @@ -87,6 +87,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} %changelog +* Thu Apr 05 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.4-1 +- made new pylint on Fedora 16 happy + * Tue Apr 03 2012 Jan Pazdziora 1.8.3-1 - 809444 - support for psql syntax (mzazrivec(a)redhat.com) commit 4740b505e996752ea0bc17ee6ebeeb42da23e137 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Apr 5 12:06:53 2012 +0200 made new pylint on Fedora 16 happy diff --git a/utils/depsolver.py b/utils/depsolver.py index e18f49d..33fd383 100644 --- a/utils/depsolver.py +++ b/utils/depsolver.py @@ -158,11 +158,11 @@ class DepSolver: return results def __whatProvides(self, name, flags, version): + # pylint: disable=W0702 try: return ListPackageSack(self._repostore.pkgSack.searchProvides((name, flags, version))) except: #perhaps we're on older version of yum try old style - # pylint: disable=W0702 return ListPackageSack(self._repostore.pkgSack.searchProvides(name)) @staticmethod

1 0

java/code
by Tomas Lestach 04 Apr '12

04 Apr '12

java/code/webapp/WEB-INF/struts-config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 09bd2188a3b7c4aeef306266560e6d087474644d Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 4 16:09:24 2012 +0200 fix typo diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index e20aa63..1d9d72f 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -6109,7 +6109,7 @@ type="com.redhat.rhn.frontend.action.systems.virtualization.ProvisionVirtualizationWizardAction" className="com.redhat.rhn.frontend.struts.RhnActionMapping"> <set-property property="postRequiredIfSubmitted" value="true" /> - <set-property property="acls" value="not system_is_virtual(); system_has_management_entitlement();system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)>"/> + <set-property property="acls" value="not system_is_virtual(); system_has_management_entitlement();system_feature(ftr_kickstart) or system_feature(ftr_snapshotting)"/> <forward name="first" path="/WEB-INF/pages/systems/details/virtualization/provision/first.jsp"/> <forward name="second"

1 0

Changes to 'refs/tags/spacewalk-java-1.8.34-1'
by StephenHerr 04 Apr '12

04 Apr '12

Tag 'spacewalk-java-1.8.34-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-04-04 14:53 +0000 Tagging package [spacewalk-java] version [1.8.34-1] in directory [java/]. Changes since spacewalk-schema-1.8.14-1: Jan Pazdziora (2): No not report changes that we do not want/need to tag on. 805952 - make the "allocation to equal" value optional. Stephen Herr (2): 809868 - Make automatically-scheduled tasks visible on Failed and Archived tabs Automatic commit of package [spacewalk-java] release [1.8.34-1]. Tomas Lestach (1): Fix naming of cloned errata to replace only the first 2 chars --- java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 8 ++++---- java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 4 ++-- java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java | 4 ++-- java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java | 4 ++-- java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/validation/virtualGuestsForm.xsd | 1 + java/spacewalk-java.spec | 10 +++++++++- rel-eng/git-untagged-commits.pl | 4 +++- rel-eng/packages/spacewalk-java | 2 +- web/modules/rhn/RHN/DB/ErrataEditor.pm | 4 ++-- 9 files changed, 26 insertions(+), 15 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by StephenHerr 04 Apr '12

04 Apr '12

java/spacewalk-java.spec | 10 +++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) New commits: commit 6192a21f6dd06f9938acbbaafeed22e237bb6604 Author: Stephen Herr <sherr(a)redhat.com> Date: Wed Apr 4 10:53:58 2012 -0400 Automatic commit of package [spacewalk-java] release [1.8.34-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 62f1f53..2652f47 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.33 +Version: 1.8.34 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -604,6 +604,14 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Apr 04 2012 Stephen Herr <sherr(a)redhat.com> 1.8.34-1 +- 809868 - Make automatically-scheduled tasks visible on Failed and Archived + tabs (sherr(a)redhat.com) +- 805952 - make the "allocation to equal" value optional. + (jpazdziora(a)redhat.com) +- Fix naming of cloned errata to replace only the first 2 chars + (tlestach(a)redhat.com) + * Tue Apr 03 2012 Jan Pazdziora 1.8.33-1 - 804949 - make invocation of rhn_channel.convert_to_fve database-agnostic. diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 6327a3a..e1de6a9 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.33-1 java/ +1.8.34-1 java/

1 0

java/code
by StephenHerr 04 Apr '12

04 Apr '12

java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit ee785ba386efac238bf2848f222369337623f332 Author: Stephen Herr <sherr(a)redhat.com> Date: Wed Apr 4 10:36:13 2012 -0400 809868 - Make automatically-scheduled tasks visible on Failed and Archived tabs diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml index b2c5416..b5162ca 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml @@ -217,12 +217,12 @@ SELECT DISTINCT UAO.id AS ID, (SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status IN (0,1)) AS "IN_PROGRESS_SYSTEMS", (SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status = 2) AS "COMPLETED_SYSTEMS", (SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status = 3) AS "FAILED_SYSTEMS" - FROM rhnUserActionOverview UAO, web_contact WC + FROM rhnUserActionOverview UAO left join + web_contact WC on UAO.scheduler = WC.id WHERE UAO.org_id = :org_id AND UAO.user_id = :user_id AND UAO.action_status_id = 3 AND UAO.archived = 0 - AND WC.id = UAO.scheduler ORDER BY EARLIEST DESC </query> @@ -242,11 +242,11 @@ SELECT DISTINCT UAO.id AS ID, (SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status IN (0,1)) AS "IN_PROGRESS_SYSTEMS", (SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status = 2) AS "COMPLETED_SYSTEMS", (SELECT COUNT(server_id) FROM rhnServerAction WHERE action_id = UAO.id AND status = 3) AS "FAILED_SYSTEMS" - FROM rhnUserActionOverview UAO, web_contact WC + FROM rhnUserActionOverview UAO left join + web_contact WC on UAO.scheduler = WC.id WHERE UAO.org_id = :org_id AND UAO.user_id = :user_id AND UAO.archived = 1 - AND WC.id = UAO.scheduler ORDER BY EARLIEST DESC </query>

1 0

java/code
by Jan Pazdziora 04 Apr '12

04 Apr '12

java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/validation/virtualGuestsForm.xsd | 1 + 1 file changed, 1 insertion(+) New commits: commit 272edc3f43e10ff3de95a90624103829a24dd0b4 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Wed Apr 4 11:46:02 2012 +0200 805952 - make the "allocation to equal" value optional. diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/validation/virtualGuestsForm.xsd b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/validation/virtualGuestsForm.xsd index 8de7dda..45fc182 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/validation/virtualGuestsForm.xsd +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/validation/virtualGuestsForm.xsd @@ -8,6 +8,7 @@ <simpleType baseType="int"> <minLength value="1" /> <maxLength value="10" /> + <optional/> </simpleType> </attribute>

1 0

java/code web/modules
by Tomas Lestach 04 Apr '12

04 Apr '12

java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 4 ++-- java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java | 4 ++-- java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java | 4 ++-- web/modules/rhn/RHN/DB/ErrataEditor.pm | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 96f4e2cdeebc50d35b8a0e959506452eadb0aa26 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Apr 4 10:37:50 2012 +0200 Fix naming of cloned errata to replace only the first 2 chars when replacing first 3 chars, errata type information gets lost (RHBA - > CLA / CLBA) based on Johannes Renner pathes from: https://www.redhat.com/archives/spacewalk-devel/2012-March/msg00022.html just prepending "CL-" to the original erratum name isn't good due to the maximum errata name limitation diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java index 586be0b..f4477cc 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java +++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java @@ -379,8 +379,8 @@ public class ErrataFactory extends HibernateFactory { public static Errata createClone(Org org, Errata e) { - String baseClonedAdvisoryName = "CL" + e.getAdvisoryName().substring(3); - String baseClonedAdvisory = "CL" + e.getAdvisory().substring(3); + String baseClonedAdvisoryName = "CL" + e.getAdvisoryName().substring(2); + String baseClonedAdvisory = "CL" + e.getAdvisory().substring(2); String clonedAdvisory = baseClonedAdvisory; String clonedAdvisoryName = baseClonedAdvisoryName; boolean unusedNameFound = false; diff --git a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java index a304a77..15852ce 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java @@ -333,8 +333,8 @@ public class ErrataFactoryTest extends BaseTestCaseWithUser { Channel baseChannel = ChannelTestUtils.createBaseChannel(user); published.addChannel(baseChannel); Errata clone = ErrataFactory.createClone(user.getOrg(), published); - String clonedAdvisoryName = "CL" + published.getAdvisoryName().substring(3); - String clonedAdvisory = "CL" + published.getAdvisory().substring(3); + String clonedAdvisoryName = "CL" + published.getAdvisoryName().substring(2); + String clonedAdvisory = "CL" + published.getAdvisory().substring(2); assertNotNull(clone.getId()); assertFalse(published.isCloned()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java index 6b0ffa4..0690e78 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java @@ -107,8 +107,8 @@ public class PublishErrataHelper { } - String baseClonedAdvisoryName = "CL" + original.getAdvisoryName().substring(3); - String baseClonedAdvisory = "CL" + original.getAdvisory().substring(3); + String baseClonedAdvisoryName = "CL" + original.getAdvisoryName().substring(2); + String baseClonedAdvisory = "CL" + original.getAdvisory().substring(2); String clonedAdvisory = baseClonedAdvisory; String clonedAdvisoryName = baseClonedAdvisoryName; boolean unusedNameFound = false; diff --git a/web/modules/rhn/RHN/DB/ErrataEditor.pm b/web/modules/rhn/RHN/DB/ErrataEditor.pm index 8c19fa5..b295563 100644 --- a/web/modules/rhn/RHN/DB/ErrataEditor.pm +++ b/web/modules/rhn/RHN/DB/ErrataEditor.pm @@ -159,8 +159,8 @@ sub find_next_advisory { my $suffix = ''; my $i = 1; - $adv = 'CL' . substr($adv, 3); - $adv_name = 'CL' . substr($adv_name, 3); + $adv = 'CL' . substr($adv, 2); + $adv_name = 'CL' . substr($adv_name, 2); if (advisory_exists($adv) || advisory_name_exists($adv_name)) { $suffix = sprintf("-%u", $i++);

1 0

rel-eng/git-untagged-commits.pl
by Jan Pazdziora 03 Apr '12

03 Apr '12

rel-eng/git-untagged-commits.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 3deb3374bd3874b90c6a9e7772d552000dfd4a4b Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 3 17:00:40 2012 +0200 No not report changes that we do not want/need to tag on. diff --git a/rel-eng/git-untagged-commits.pl b/rel-eng/git-untagged-commits.pl index 3381056..7bd04b1 100755 --- a/rel-eng/git-untagged-commits.pl +++ b/rel-eng/git-untagged-commits.pl @@ -34,7 +34,9 @@ for my $file (@files) { close FILE; my $name = File::Basename::basename($file); my ($version, $dir) = split /\s/, $line; - my @changes = `git log --pretty=format:'%h %s (%ae)' $name-$version..HEAD -- $cdup$dir`; + my @changes = + grep { not /^\S+\s([Bb]umping package versions for|All the NoTgzBuilders are now)/ } + `git log --pretty=format:'%h %s (%ae)' $name-$version..HEAD -- $cdup$dir`; if (@changes) { print "$name-$version..HEAD:\n"; print @changes, "\n";

1 0

Changes to 'refs/tags/spacewalk-schema-1.8.14-1'
by Jan Pazdziora 03 Apr '12

03 Apr '12

Tag 'spacewalk-schema-1.8.14-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-03 14:57 +0000 Tagging package [spacewalk-schema] version [1.8.14-1] in directory [schema/spacewalk/]. Changes since spacewalk-utils-1.8.3-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-schema] release [1.8.14-1]. --- rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages schema/spacewalk
by Jan Pazdziora 03 Apr '12

03 Apr '12

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit d331c60b6267ad8ec477a1270152125a3d741b51 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 3 16:57:50 2012 +0200 Automatic commit of package [spacewalk-schema] release [1.8.14-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index f4197d8..c78aa3f 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -1.8.13-1 schema/spacewalk/ +1.8.14-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index df3fef5..86449c8 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -2,7 +2,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 1.8.13 +Version: 1.8.14 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Tue Apr 03 2012 Jan Pazdziora 1.8.14-1 +- fix procedure dependencies (mzazrivec(a)redhat.com) + * Fri Mar 30 2012 Jan Pazdziora 1.8.13-1 - Add dependency for rhnXccdfRuleIdentMap to force order.

1 0

Changes to 'refs/tags/spacewalk-utils-1.8.3-1'
by Jan Pazdziora 03 Apr '12

03 Apr '12

Tag 'spacewalk-utils-1.8.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-03 14:57 +0000 Tagging package [spacewalk-utils] version [1.8.3-1] in directory [utils/]. Changes since spacewalk-reports-1.8.2-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-utils] release [1.8.3-1]. --- rel-eng/packages/spacewalk-utils | 2 +- utils/spacewalk-utils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages utils/spacewalk-utils.spec
by Jan Pazdziora 03 Apr '12

03 Apr '12

rel-eng/packages/spacewalk-utils | 2 +- utils/spacewalk-utils.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 8eadb0fcb68fda09a3aea75435c9b8396385ac1d Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 3 16:57:01 2012 +0200 Automatic commit of package [spacewalk-utils] release [1.8.3-1]. diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils index 71ec5ba..42471d6 100644 --- a/rel-eng/packages/spacewalk-utils +++ b/rel-eng/packages/spacewalk-utils @@ -1 +1 @@ -1.8.2-1 utils/ +1.8.3-1 utils/ diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec index 40aecd7..c0af1e3 100644 --- a/utils/spacewalk-utils.spec +++ b/utils/spacewalk-utils.spec @@ -1,7 +1,7 @@ %define rhnroot %{_prefix}/share/rhn Name: spacewalk-utils -Version: 1.8.2 +Version: 1.8.3 Release: 1%{?dist} Summary: Utilities that may be run against a Spacewalk server. @@ -87,6 +87,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} %changelog +* Tue Apr 03 2012 Jan Pazdziora 1.8.3-1 +- 809444 - support for psql syntax (mzazrivec(a)redhat.com) + * Sun Mar 18 2012 Aron Parsons <aronparsons(a)gmail.com> 1.8.2-1 - added spacewalk-manage-channel-lifecycle script (aronparsons(a)gmail.com) - spacewalk-clone-by-date manpage bugfixes/cleanups (shardy(a)redhat.com)

1 0

Changes to 'refs/tags/spacewalk-reports-1.8.2-1'
by Jan Pazdziora 03 Apr '12

03 Apr '12

Tag 'spacewalk-reports-1.8.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-03 14:56 +0000 Tagging package [spacewalk-reports] version [1.8.2-1] in directory [reporting/]. Changes since spacewalk-backend-1.8.11-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-reports] release [1.8.2-1]. --- rel-eng/packages/spacewalk-reports | 2 +- reporting/spacewalk-reports.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages reporting/spacewalk-reports.spec
by Jan Pazdziora 03 Apr '12

03 Apr '12

rel-eng/packages/spacewalk-reports | 2 +- reporting/spacewalk-reports.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit e8b84312c97b0d3cc562e7c54d695cae2d412397 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 3 16:56:27 2012 +0200 Automatic commit of package [spacewalk-reports] release [1.8.2-1]. diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports index f7e13dd..85cc036 100644 --- a/rel-eng/packages/spacewalk-reports +++ b/rel-eng/packages/spacewalk-reports @@ -1 +1 @@ -1.8.1-1 reporting/ +1.8.2-1 reporting/ diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec index 2a2e3c9..d370926 100644 --- a/reporting/spacewalk-reports.spec +++ b/reporting/spacewalk-reports.spec @@ -2,7 +2,7 @@ Name: spacewalk-reports Summary: Script based reporting Group: Applications/Internet License: GPLv2 -Version: 1.8.1 +Version: 1.8.2 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -42,6 +42,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/spacewalk-report.8* %changelog +* Tue Apr 03 2012 Jan Pazdziora 1.8.2-1 +- Rework reporting to correspond with 0-n rule/ident mapping + (slukasik(a)redhat.com) + * Wed Mar 14 2012 Jan Pazdziora 1.8.1-1 - 803228 - concatenation with null gives null on PostgreSQL, fixing.

1 0

Changes to 'refs/tags/spacewalk-backend-1.8.11-1'
by Jan Pazdziora 03 Apr '12

03 Apr '12

Tag 'spacewalk-backend-1.8.11-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-03 14:55 +0000 Tagging package [spacewalk-backend] version [1.8.11-1] in directory [backend/]. Changes since rhn-client-tools-1.8.2-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-backend] release [1.8.11-1]. --- backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora 03 Apr '12

03 Apr '12

backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 9c3a188093c1428b1c4e7857d343a32bf9ad35f2 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 3 16:55:24 2012 +0200 Automatic commit of package [spacewalk-backend] release [1.8.11-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index c7cc80f..618fe0f 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.8.10 +Version: 1.8.11 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -688,6 +688,9 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Tue Apr 03 2012 Jan Pazdziora 1.8.11-1 +- Fixing typo in spacewalk-remove-channel man page. + * Fri Mar 30 2012 Stephen Herr <sherr(a)redhat.com> 1.8.10-1 - 808516 - When importing channeldumps from Sat 5.3 or older we should assume sha1 checksum type (sherr(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index a36b232..bccbfcb 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.8.10-1 backend/ +1.8.11-1 backend/

1 0

Changes to 'refs/tags/rhn-client-tools-1.8.2-1'
by Jan Pazdziora 03 Apr '12

03 Apr '12

Tag 'rhn-client-tools-1.8.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-03 14:54 +0000 Tagging package [rhn-client-tools] version [1.8.2-1] in directory [client/rhel/rhn-client-tools/]. Changes since spacewalk-java-1.8.33-1: Jan Pazdziora (1): Automatic commit of package [rhn-client-tools] release [1.8.2-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(-) ---

1 0

client/rhel rel-eng/packages
by Jan Pazdziora 03 Apr '12

03 Apr '12

client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++- rel-eng/packages/rhn-client-tools | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit d5734e887fb72abe83c2d3501ea67ea315c4266f Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 3 16:54:36 2012 +0200 Automatic commit of package [rhn-client-tools] release [1.8.2-1]. diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index 916fb3e..224e34f 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools -Version: 1.8.1 +Version: 1.8.2 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -333,6 +333,10 @@ make -f Makefile.rhn-client-tools test %endif %changelog +* Tue Apr 03 2012 Jan Pazdziora 1.8.2-1 +- 804559 - not all msgs are CommunicationError objects (mzazrivec(a)redhat.com) +- 804559 - correct string catenation (mzazrivec(a)redhat.com) + * Fri Mar 09 2012 Miroslav Suchý 1.8.1-1 - fix typo in man page - 772070 - classic hosted alignment is no longer needed (mzazrivec(a)redhat.com) diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools index 184140c..ffbfca3 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -1.8.1-1 client/rhel/rhn-client-tools/ +1.8.2-1 client/rhel/rhn-client-tools/

1 0

Changes to 'refs/tags/spacewalk-java-1.8.33-1'
by Jan Pazdziora 03 Apr '12

03 Apr '12

Tag 'spacewalk-java-1.8.33-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-03 14:52 +0000 Tagging package [spacewalk-java] version [1.8.33-1] in directory [java/]. Changes since osad-5.10.42-1: Jan Pazdziora (2): 804949 - make invocation of rhn_channel.convert_to_fve database-agnostic. Automatic commit of package [spacewalk-java] release [1.8.33-1]. --- java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 2 +- java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora 03 Apr '12

03 Apr '12

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 87f8a365c9de4ab2317d5051d3a4ab1046daa77e Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 3 16:52:49 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.33-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 72acce3..62f1f53 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.32 +Version: 1.8.33 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -604,6 +604,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Apr 03 2012 Jan Pazdziora 1.8.33-1 +- 804949 - make invocation of rhn_channel.convert_to_fve database-agnostic. + * Tue Apr 03 2012 Jan Pazdziora 1.8.32-1 - 804949 - make invocation of rhn_channel.convert_to_fve database-agnostic. - Revert "removing unused string with trans-id 'configfilefilter.path'" diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index d0ba780..6327a3a 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.32-1 java/ +1.8.33-1 java/

1 0

java/code
by Jan Pazdziora 03 Apr '12

03 Apr '12

java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e96b99f67117a57a10331f4187db2d1ab35de978 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 3 16:51:29 2012 +0200 804949 - make invocation of rhn_channel.convert_to_fve database-agnostic. Addressing ERROR: syntax error at or near "rhn_channel" at character 9 STATEMENT: BEGIN rhn_channel.convert_to_fve($1, $2) ERROR: current transaction is aborted, commands ignored until end of transaction block diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml index d443732..108ecc5 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml @@ -1005,7 +1005,7 @@ GROUP BY C.id, C.name <callable-mode name="convert_to_flex"> <query params="sid, cfid, uid"> - { rhn_channel.convert_to_fve(:sid, :cfid) } + { call rhn_channel.convert_to_fve(:sid, :cfid) } </query> </callable-mode>

1 0

Changes to 'refs/tags/osad-5.10.42-1'
by Jan Pazdziora 03 Apr '12

03 Apr '12

Tag 'osad-5.10.42-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-03 14:49 +0000 Tagging package [osad] version [5.10.42-1] in directory [client/tools/osad/]. Changes since NOCpulsePlugins-2.209.5-1: Jan Pazdziora (1): Automatic commit of package [osad] release [5.10.42-1]. --- client/tools/osad/osad.spec | 7 ++++++- rel-eng/packages/osad | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) ---

1 0

client/tools rel-eng/packages
by Jan Pazdziora 03 Apr '12

03 Apr '12

client/tools/osad/osad.spec | 7 ++++++- rel-eng/packages/osad | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) New commits: commit fe5d3ba40958a5cd73fda4f714c7a5908de850f5 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 3 16:49:20 2012 +0200 Automatic commit of package [osad] release [5.10.42-1]. diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index ce590df..f66bd5c 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -16,7 +16,7 @@ Group: System Environment/Daemons License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 5.10.41 +Version: 5.10.42 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -278,6 +278,11 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {} %endif %changelog +* Tue Apr 03 2012 Jan Pazdziora 5.10.42-1 +- use %%global, not %%define (msuchy(a)redhat.com) +- osad.src:477: W: macro-in-%%changelog %%descriptions (msuchy(a)redhat.com) +- osad.src:154: W: macro-in-comment %%post (msuchy(a)redhat.com) + * Fri Mar 02 2012 Jan Pazdziora 5.10.41-1 - Update the copyright year info. diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index 194c404..f6740f2 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.10.41-1 client/tools/osad/ +5.10.42-1 client/tools/osad/

1 0

Changes to 'refs/tags/NOCpulsePlugins-2.209.5-1'
by Jan Pazdziora 03 Apr '12

03 Apr '12

Tag 'NOCpulsePlugins-2.209.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-03 14:46 +0000 Tagging package [NOCpulsePlugins] version [2.209.5-1] in directory [monitoring/NOCpulsePlugins/]. Changes since spacewalk-web-1.8.7-1: Jan Pazdziora (1): Automatic commit of package [NOCpulsePlugins] release [2.209.5-1]. --- monitoring/NOCpulsePlugins/NOCpulsePlugins.spec | 5 ++++- rel-eng/packages/NOCpulsePlugins | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

monitoring/NOCpulsePlugins rel-eng/packages
by Jan Pazdziora 03 Apr '12

03 Apr '12

monitoring/NOCpulsePlugins/NOCpulsePlugins.spec | 5 ++++- rel-eng/packages/NOCpulsePlugins | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 64891eb66b38d298a09444f3a0097857eda39f27 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 3 16:46:26 2012 +0200 Automatic commit of package [NOCpulsePlugins] release [2.209.5-1]. diff --git a/monitoring/NOCpulsePlugins/NOCpulsePlugins.spec b/monitoring/NOCpulsePlugins/NOCpulsePlugins.spec index 7b2b0f1..56b93ea 100644 --- a/monitoring/NOCpulsePlugins/NOCpulsePlugins.spec +++ b/monitoring/NOCpulsePlugins/NOCpulsePlugins.spec @@ -1,5 +1,5 @@ Name: NOCpulsePlugins -Version: 2.209.4 +Version: 2.209.5 Release: 1%{?dist} Summary: NOCpulse authored Plug-ins URL: https://fedorahosted.org/spacewalk @@ -88,6 +88,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 03 2012 Jan Pazdziora 2.209.5-1 +- 518985 - fix ORA-00918: column ambiguously defined (mzazrivec(a)redhat.com) + * Tue Mar 13 2012 Michael Mraka <michael.mraka(a)redhat.com> 2.209.4-1 - fixed error: %%changelog entries must start with * diff --git a/rel-eng/packages/NOCpulsePlugins b/rel-eng/packages/NOCpulsePlugins index c4c7a02..5cb2af4 100644 --- a/rel-eng/packages/NOCpulsePlugins +++ b/rel-eng/packages/NOCpulsePlugins @@ -1 +1 @@ -2.209.4-1 monitoring/NOCpulsePlugins/ +2.209.5-1 monitoring/NOCpulsePlugins/

1 0

Changes to 'refs/tags/spacewalk-web-1.8.7-1'
by Jan Pazdziora 03 Apr '12

03 Apr '12

Tag 'spacewalk-web-1.8.7-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-03 14:44 +0000 Tagging package [spacewalk-web] version [1.8.7-1] in directory [web/]. Changes since spacewalk-java-1.8.32-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-web] release [1.8.7-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora 03 Apr '12

03 Apr '12

rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 385a9eda018e2bcc992db777ed88d110d94690ed Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 3 16:44:51 2012 +0200 Automatic commit of package [spacewalk-web] release [1.8.7-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index dfe725a..3d0ced7 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -1.8.6-1 web/ +1.8.7-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index ddc338e..040b08f 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 1.8.6 +Version: 1.8.7 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -254,6 +254,9 @@ rm -rf $RPM_BUILD_ROOT # $Id$ %changelog +* Tue Apr 03 2012 Jan Pazdziora 1.8.7-1 +- 806439 - Changing perl sitenav too (sherr(a)redhat.com) + * Wed Mar 21 2012 Jan Pazdziora 1.8.6-1 - Fixing regular_systems_in_channel_family for PostgreSQL.

1 0

Changes to 'refs/tags/spacewalk-java-1.8.32-1'
by Jan Pazdziora 03 Apr '12

03 Apr '12

Tag 'spacewalk-java-1.8.32-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-03 14:42 +0000 Tagging package [spacewalk-java] version [1.8.32-1] in directory [java/]. Changes since spacewalk-admin-1.8.4-1: Jan Pazdziora (4): Fixing typo in spacewalk-remove-channel man page. 804949 - make invocation of rhn_channel.convert_to_fve database-agnostic. 804949 - make invocation of rhn_channel.convert_to_fve database-agnostic. Automatic commit of package [spacewalk-java] release [1.8.32-1]. Milan Zazrivec (3): 518985 - fix ORA-00918: column ambiguously defined fix procedure dependencies 809444 - support for psql syntax Miroslav Suchý (14): Revert "removing unused string with trans-id 'userlist.jsp.enabled'" Revert "removing unused string with trans-id 'userlist.jsp.disabled'" Revert "removing unused string with trans-id 'sdc.config.diff.files_1_dirs_0_symlinks_0'" Revert "removing unused string with trans-id 'sdc.config.differing.files_1'" Revert "removing unused string with trans-id 'preferences.inactive-systems.description'" Revert "removing unused string with trans-id 'preferences.inactive-systems.name'" Revert "removing unused string with trans-id 'preferences.critical-systems.name'" Revert "removing unused string with trans-id 'preferences.critical-systems.description'" Revert "removing unused string with trans-id 'preferences.critical-probes.name'" Revert "removing unused string with trans-id 'preferences.critical-probes.description'" Revert "removing unused string with trans-id 'config_target_systems.subscribeSystems.success'" Revert "removing unused string with trans-id 'config_subscribed_systems.unsubscribeSystems.success'" Revert "removing unused string with trans-id 'configchannelfilter.name'" Revert "removing unused string with trans-id 'configfilefilter.path'" --- backend/satellite_tools/spacewalk-remove-channel.sgml | 2 java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 54 ++++++++++ java/spacewalk-java.spec | 36 ++++++ monitoring/NOCpulsePlugins/Oracle/IdleSessions.pm | 2 rel-eng/packages/spacewalk-java | 2 schema/spacewalk/oracle/procs/procs.deps | 8 + utils/spacewalk-hostname-rename | 26 +++- 39 files changed, 1248 insertions(+), 16 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora 03 Apr '12

03 Apr '12

java/spacewalk-java.spec | 36 +++++++++++++++++++++++++++++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 36 insertions(+), 2 deletions(-) New commits: commit 63ceed43000f724cb671f8f4c0452200180d7b0a Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 3 16:42:22 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.32-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 7ae7c45..72acce3 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.31 +Version: 1.8.32 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -604,6 +604,40 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Apr 03 2012 Jan Pazdziora 1.8.32-1 +- 804949 - make invocation of rhn_channel.convert_to_fve database-agnostic. +- Revert "removing unused string with trans-id 'configfilefilter.path'" + (msuchy(a)redhat.com) +- Revert "removing unused string with trans-id 'configchannelfilter.name'" + (msuchy(a)redhat.com) +- Revert "removing unused string with trans-id + 'config_subscribed_systems.unsubscribeSystems.success'" (msuchy(a)redhat.com) +- Revert "removing unused string with trans-id + 'config_target_systems.subscribeSystems.success'" (msuchy(a)redhat.com) +- Revert "removing unused string with trans-id 'preferences.critical- + probes.description'" (msuchy(a)redhat.com) +- Revert "removing unused string with trans-id 'preferences.critical- + probes.name'" (msuchy(a)redhat.com) +- Revert "removing unused string with trans-id 'preferences.critical- + systems.description'" (msuchy(a)redhat.com) +- Revert "removing unused string with trans-id 'preferences.critical- + systems.name'" (msuchy(a)redhat.com) +- Revert "removing unused string with trans-id 'preferences.inactive- + systems.name'" (msuchy(a)redhat.com) +- Revert "removing unused string with trans-id 'preferences.inactive- + systems.description'" (msuchy(a)redhat.com) +- Revert "removing unused string with trans-id 'sdc.config.differing.files_1'" + (msuchy(a)redhat.com) +- Revert "removing unused string with trans-id + 'sdc.config.diff.files_1_dirs_0_symlinks_0'" (msuchy(a)redhat.com) +- Revert "removing unused string with trans-id 'userlist.jsp.disabled'" + (msuchy(a)redhat.com) +- Revert "removing unused string with trans-id 'userlist.jsp.enabled'" + (msuchy(a)redhat.com) +- Fix checkstyle error (invalid use of the {@inheritDoc} tag) (jrenner(a)suse.de) +- Add lib directory to checkstyle classpath (jrenner(a)suse.de) +- New web page -- details of the xccdf:rule-result (slukasik(a)redhat.com) + * Thu Mar 29 2012 Stephen Herr <sherr(a)redhat.com> 1.8.31-1 - 808210 - Fixing ISE on selecting None yum checksum type for channel (sherr(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 593096d..d0ba780 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.31-1 java/ +1.8.32-1 java/

1 0

java/code
by Jan Pazdziora 03 Apr '12

03 Apr '12

java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1b5ad3b08936594c0e4ea75b1ed045e40f03a663 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 3 16:41:22 2012 +0200 804949 - make invocation of rhn_channel.convert_to_fve database-agnostic. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml index 18c58e3..d443732 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml @@ -1005,7 +1005,7 @@ GROUP BY C.id, C.name <callable-mode name="convert_to_flex"> <query params="sid, cfid, uid"> - { rhn_channel.convert_to_fve(:sid, :cfid); } + { rhn_channel.convert_to_fve(:sid, :cfid) } </query> </callable-mode>

1 0

java/code
by Jan Pazdziora 03 Apr '12

03 Apr '12

java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 2c363146675e88fb5517f39aacc04efb842058bb Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Apr 3 16:39:01 2012 +0200 804949 - make invocation of rhn_channel.convert_to_fve database-agnostic. diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml index 79408ce..18c58e3 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml @@ -1005,9 +1005,7 @@ GROUP BY C.id, C.name <callable-mode name="convert_to_flex"> <query params="sid, cfid, uid"> -BEGIN - rhn_channel.convert_to_fve(:sid, :cfid); -END; + { rhn_channel.convert_to_fve(:sid, :cfid); } </query> </callable-mode>

1 0

utils/spacewalk-hostname-rename
by Milan Zazrivec 03 Apr '12

03 Apr '12

utils/spacewalk-hostname-rename | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) New commits: commit af92a3dd2101a0b9759ad63f8abfd138089d5c2f Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Apr 3 16:23:30 2012 +0200 809444 - support for psql syntax diff --git a/utils/spacewalk-hostname-rename b/utils/spacewalk-hostname-rename index 4654bc0..23ff455 100755 --- a/utils/spacewalk-hostname-rename +++ b/utils/spacewalk-hostname-rename @@ -29,6 +29,19 @@ BOOTSTRAP_CCO=/var/www/html/pub/bootstrap/client-config-overrides.txt SAT_LOCAL_RULES_CONF=/var/lib/rhn/rhn-satellite-prep/satellite-local-rules.conf BACKUP_EXT=.rnmbck +if [ "$(spacewalk-cfg-get db_backend)" = "oracle" ]; then + DBSHELL_QUIT="QUIT" + DBSHELL_QUIET=" +set feed off; +set pages 0;" + +elif [ "$(spacewalk-cfg-get db_backend)" = "postgresql" ]; then + DBSHELL_QUIT="\q" + DBSHELL_QUIET=" +\set QUIET on +\t" +fi + if [ -x /etc/init.d/oracle ]; then DB_SERVICE="oracle" fi @@ -331,7 +344,7 @@ function update_monitoring_data { UPDATE rhn_sat_cluster SET vip = '$IP' WHERE public_key LIKE '${NOCPULSE_OLD_PUBLIC_KEY}%'; UPDATE rhn_sat_node SET ip = '$IP' WHERE EXISTS (SELECT 1 FROM rhn_sat_cluster RSC WHERE RSC.public_key LIKE '${NOCPULSE_OLD_PUBLIC_KEY}%' AND sat_cluster_id = RSC.recid); COMMIT; -QUIT +$DBSHELL_QUIT EOS } @@ -410,10 +423,9 @@ then fi SQL_RET=$( -echo "set feed off; -set pages 0; +echo "$DBSHELL_QUIET select 0 from dual; -exit; +$DBSHELL_QUIT " | spacewalk-sql --select-mode - ) # SQL_RET="${SQL_RET#"${SQL_RET%%[![:space:]]*}"}" @@ -450,7 +462,7 @@ then UPDATE rhn_config_macro SET definition='$HOSTNAME' WHERE name='RHN_SAT_HOSTNAME'; UPDATE rhn_config_macro SET definition='$HOSTNAME' WHERE name='MDOM'; COMMIT; -QUIT +$DBSHELL_QUIT EOS print_status 0 # just simulate end fi @@ -479,7 +491,7 @@ echo -n "Updating other DB entries ... " | tee -a $LOG spacewalk-sql --select-mode - >>$LOG <<EOS UPDATE rhntemplatestring SET value='$HOSTNAME' WHERE label='hostname'; COMMIT; -QUIT +$DBSHELL_QUIT EOS print_status 0 # just simulate end @@ -493,7 +505,7 @@ echo -n "Changing jabberd settings ... " | tee -a $LOG spacewalk-sql --select-mode - >>$LOG <<EOS DELETE FROM rhnPushDispatcher WHERE hostname != '$HOSTNAME'; COMMIT; -QUIT +$DBSHELL_QUIT EOS for jabber_config_file in c2s.xml s2s.xml sm.xml

1 0

schema/spacewalk
by Milan Zazrivec 02 Apr '12

02 Apr '12

schema/spacewalk/oracle/procs/procs.deps | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit 8de16deebb0d24b0dbfb9841864e29e1003a49f4 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Mon Apr 2 16:02:26 2012 +0200 fix procedure dependencies diff --git a/schema/spacewalk/oracle/procs/procs.deps b/schema/spacewalk/oracle/procs/procs.deps index eb44188..8202c57 100644 --- a/schema/spacewalk/oracle/procs/procs.deps +++ b/schema/spacewalk/oracle/procs/procs.deps @@ -63,7 +63,10 @@ insert_checksum :: rhnChecksum rhnChecksumType insert_config_filename :: rhnConfigFileName insert_config_info :: rhnConfigInfo insert_evr :: rhnPackageEVR +insert_package_name :: rhnPackageName insert_package_nevra :: rhnPackageNEVRA +insert_package_capability :: rhnPackageCapability +insert_package_delta :: rhnPackageDelta insert_source_name :: rhnSourceRPM insert_tag :: rhnTag insert_tag_name :: rhnTagName @@ -99,8 +102,9 @@ lookup_functions :: lookup_evr lookup_package_name \ lookup_tag lookup_arch_type lookup_package_arch :: rhn_exception.pks data/rhnException rhnPackageArch \ data/rhnPackageArch -lookup_package_capability :: rhnPackageCapability -lookup_package_name :: rhnPackageName +lookup_package_capability :: rhnPackageCapability insert_package_capability +lookup_package_delta :: rhnPackageDelta insert_package_delta +lookup_package_name :: rhnPackageName insert_package_name lookup_package_provider :: rhnPackageProvider lookup_package_key_type :: rhnPackageKeyType lookup_package_nevra :: rhnPackageNEVRA insert_package_nevra

1 0

14 commits - java/code
by Miroslav Suchý 02 Apr '12

02 Apr '12

java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 20 +++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 54 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 54 ++++++++++ 32 files changed, 1184 insertions(+) New commits: commit 1f79ca4171ba6e3a3f0cd463e52382e0b685bff5 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 2 15:26:51 2012 +0200 Revert "removing unused string with trans-id 'configfilefilter.path'" This reverts commit c20836368f267eb43f98a7f2c4fb1f00186f3d08. 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 5284005..b6080e7 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 @@ -12389,6 +12389,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>সিস্টেমের নাম</target></trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + <target>পাথ</target></trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</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 1c995e0..a18064b 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 @@ -12406,6 +12406,9 @@ Beachten Sie bitte, dass wenn eine bestimmtes System eine bestimmte Datei au&amp <source>System Name</source> <target>Systemname</target></trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + <target>Pfad</target></trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</source> <target>Channel-Name</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 28323d0..e8fdccb 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 @@ -12996,6 +12996,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> </trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + </trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</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 7f0799e..bd5c9b9 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 @@ -12402,6 +12402,9 @@ Observe que si un sistema dado sobrescribe un archivo, o tiene el archivo en un <source>System Name</source> <target>Nombre del sistema</target></trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + <target>Ruta</target></trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</source> <target>Nombre del canal</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 fa44b4d..001343a 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 @@ -12405,6 +12405,9 @@ Notez que si un système donné surcharge un ficher donné ou qu'il a ce fichier <source>System Name</source> <target>Nom du système</target></trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + <target>Chemin d'accès</target></trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</source> <target>Nom du canal</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 f28ea67..7ca6f57 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 @@ -12390,6 +12390,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>સિસ્ટમ નામ</target></trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + <target>પાથ</target></trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</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 6a162ae..a5bb60b 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 @@ -12390,6 +12390,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>सिस्टम नाम</target></trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + <target>पैच</target></trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</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 cdb1b48..2885d8f 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 @@ -12387,6 +12387,9 @@ Da notare che se un dato sistema sovrascrive un determinato file, oppure se il f <source>System Name</source> <target>Nome del sistema</target></trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + <target>Percorso</target></trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</source> <target>Nome del canale</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 b0e9d4a..cccc705 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 @@ -12388,6 +12388,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>システム名</target></trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + <target>パス</target></trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</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 6fa2666..8fe4236 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 @@ -12385,6 +12385,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>시스템명</target></trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + <target>경로</target></trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</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 d914a59..fbadf2d 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 @@ -12389,6 +12389,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>ਸਿਸਟਮ ਨਾਂ</target></trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + <target>ਮਾਰਗ</target></trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</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 37a0268..ff43a13 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 @@ -12395,6 +12395,9 @@ Note que se um sistema específico sobrescrever um dado arquivo, ou existir em u <source>System Name</source> <target>Nome do Sistema</target></trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + <target>Caminho</target></trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</source> <target>Nome do Canal</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 ad949fa..3634959 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 @@ -12384,6 +12384,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>Имя системы</target></trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + <target>Путь</target></trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</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 c4086f2..9b3826c 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 @@ -12390,6 +12390,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>கணினி பெயர்</target></trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + <target>பாதை</target></trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</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 5ac6719..70849b3 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 @@ -12399,6 +12399,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>系统名称</target></trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + <target>路径</target></trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</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 17cac06..0122e82 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 @@ -12386,6 +12386,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>系統名稱</target></trans-unit> + <trans-unit id="configfilefilter.path"> + <source>Path</source> + <target>路徑</target></trans-unit> <trans-unit id="configchannelfilter.name"> <source>Channel Name</source> <target>頻道名稱</target></trans-unit> commit d494acb9781b2dbd2e354a5cb6d90a4b777b2554 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 2 15:25:51 2012 +0200 Revert "removing unused string with trans-id 'configchannelfilter.name'" 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 c8a7fcc..5284005 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 @@ -12389,6 +12389,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>সিস্টেমের নাম</target></trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + <target>চ্যানেলের নাম</target></trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> 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 274a654..1c995e0 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 @@ -12406,6 +12406,9 @@ Beachten Sie bitte, dass wenn eine bestimmtes System eine bestimmte Datei au&amp <source>System Name</source> <target>Systemname</target></trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + <target>Channel-Name</target></trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> 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 d53521f..28323d0 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 @@ -12996,6 +12996,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> </trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + </trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> 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 f8e89cf..7f0799e 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 @@ -12402,6 +12402,9 @@ Observe que si un sistema dado sobrescribe un archivo, o tiene el archivo en un <source>System Name</source> <target>Nombre del sistema</target></trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + <target>Nombre del canal</target></trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> 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 5fdb549..fa44b4d 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 @@ -12405,6 +12405,9 @@ Notez que si un système donné surcharge un ficher donné ou qu'il a ce fichier <source>System Name</source> <target>Nom du système</target></trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + <target>Nom du canal</target></trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> 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 be9a64d..f28ea67 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 @@ -12390,6 +12390,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>સિસ્ટમ નામ</target></trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + <target>ચેનલ નામ</target></trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> 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 b4b7692..6a162ae 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 @@ -12390,6 +12390,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>सिस्टम नाम</target></trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + <target>चैनल नाम</target></trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> 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 a21afe5..cdb1b48 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 @@ -12387,6 +12387,9 @@ Da notare che se un dato sistema sovrascrive un determinato file, oppure se il f <source>System Name</source> <target>Nome del sistema</target></trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + <target>Nome del canale</target></trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> 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 65b6174..b0e9d4a 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 @@ -12388,6 +12388,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>システム名</target></trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + <target>チャンネル名</target></trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> 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 620f273..6fa2666 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 @@ -12385,6 +12385,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>시스템명</target></trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + <target>채널명</target></trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> 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 02bb447..d914a59 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 @@ -12389,6 +12389,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>ਸਿਸਟਮ ਨਾਂ</target></trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + <target>ਚੈਨਲ ਨਾਂ</target></trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> 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 3d6b16d..37a0268 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 @@ -12395,6 +12395,9 @@ Note que se um sistema específico sobrescrever um dado arquivo, ou existir em u <source>System Name</source> <target>Nome do Sistema</target></trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + <target>Nome do Canal</target></trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> 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 7ac2f94..ad949fa 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 @@ -12384,6 +12384,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>Имя системы</target></trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + <target>Имя канала</target></trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> 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 a843917..c4086f2 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 @@ -12390,6 +12390,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>கணினி பெயர்</target></trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + <target>தடப் பெயர்</target></trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> 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 f9d6030..5ac6719 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 @@ -12399,6 +12399,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>系统名称</target></trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + <target>频道名</target></trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> 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 fe620e7..17cac06 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 @@ -12386,6 +12386,9 @@ Note that if a given system overrides a given file, or has it in that system's l <source>System Name</source> <target>系統名稱</target></trans-unit> + <trans-unit id="configchannelfilter.name"> + <source>Channel Name</source> + <target>頻道名稱</target></trans-unit> </group> <trans-unit id="deploy.jsp.noSystems"> commit 30334119817142d4ee1e6741200f7aa401a3beb1 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 2 15:24:28 2012 +0200 Revert "removing unused string with trans-id 'config_subscribed_systems.unsubscribeSystems.success'" 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 8a1dbe7..f5d8b65 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 @@ -6348,6 +6348,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} সিস্টেম সাফল্যের সাথে আন-সাবস্ক্রাইব করা হয়েছে।</target></trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> 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 6f3febb..3ac0df3 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 @@ -6373,6 +6373,13 @@ Folgen Sie dieser URL f&uuml;r die vollst&auml;ndige Liste inaktiver Sys + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} System(e) erfolgreich abgemeldet.</target></trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> 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 7e80e3c..e72f19a 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 @@ -6439,6 +6439,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + </trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> 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 8cefaf4..1a2a75a 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 @@ -6367,6 +6367,13 @@ Vaya a esta dirección para ver la lista completa de sistemas inactivos: + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>Cancelación con éxito de suscripciones a {0} sistema(s).</target></trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> 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 2ac6304..5ea4771 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 @@ -6369,6 +6369,13 @@ Suivez cet url pour obtenir la liste complète des systèmes inactifs : + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} système(s) a/ont bien été désabonné(s).</target></trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> 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 51ee373..3d73cb5 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 @@ -6342,6 +6342,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} સિસ્ટમ(ઓ)ની ઉમેદવારી સફળતાપૂર્વક દૂર થઈ.</target></trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> 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 4befb8e..3bb027e 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 @@ -6342,6 +6342,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} सिस्टम से सफलतापूर्वक सदस्यता वापस लिया.</target></trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> 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 67f8390..a2ab227 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 @@ -6366,6 +6366,13 @@ Seguite l'url sotto riportato per visualizzare l'elenco completo di sistemi inat + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>Rimozione sottoscrizione di {0} sistema(i) completata.</target></trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> 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 77790f9..8f229b9 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 @@ -6366,6 +6366,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} システムのサブスクライブを正常に中止しました。</target></trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> 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 8e4d967..10032be 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 @@ -6342,6 +6342,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} 시스템이 성공적으로 등록해제되었습니다.</target></trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> 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 65300d9..ac1f76c 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 @@ -6344,6 +6344,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>ਸਫਲਤਾਪੂਰਕ ਹਟਾਏ ਮੈਂਬਰ {0} ਸਿਸਟਮ।</target></trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> 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 d7839a4..02cabcf 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 @@ -6354,6 +6354,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>Cancelamento de subscrição bem sucedido {0} sistema(s)</target></trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> 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 20965ed..2e2300f 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 @@ -6342,6 +6342,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>Подписка успешно отменена для {0} систем(ы).</target></trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> 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 012cd37..61e4173 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 @@ -6342,6 +6342,13 @@ url பின்பற்றி செயலிழக்கப்பட்ட + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>வெற்றிகரமாக {0} கணினி(கள்) சந்தா நீக்கப்பட்டன.</target></trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> 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 0e7919d..6087951 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 @@ -6367,6 +6367,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>成功地退订 {0} 个系统。</target></trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> 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 1762fbd..a96f406 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 @@ -6341,6 +6341,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_subscribed_systems.unsubscribeSystems.success"> + <source>Successfully unsubscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} 個系統已被成功地解除訂閱。</target></trans-unit> <trans-unit id="config_target_systems.subscribeSystems.success"> commit 3bb10b7c63bbfc1acd3d1e1aea844c0af9c81ed2 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 2 15:23:55 2012 +0200 Revert "removing unused string with trans-id 'config_target_systems.subscribeSystems.success'" 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 0d388a9..8a1dbe7 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 @@ -6350,6 +6350,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>সাফল্যের সাথে {0} সিস্টেম সাবস্ক্রাইব করা হয়েছে।</target></trans-unit> 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 df879f3..6f3febb 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 @@ -6375,6 +6375,13 @@ Folgen Sie dieser URL f&uuml;r die vollst&auml;ndige Liste inaktiver Sys + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} System(e) erfolgreich angemeldet.</target></trans-unit> 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 b20b2f6..7e80e3c 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 @@ -6441,6 +6441,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + </trans-unit> 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 80faf7d..8cefaf4 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 @@ -6369,6 +6369,13 @@ Vaya a esta dirección para ver la lista completa de sistemas inactivos: + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} sistema(s) suscrito(s) con éxito.</target></trans-unit> 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 4fddac5..2ac6304 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 @@ -6371,6 +6371,13 @@ Suivez cet url pour obtenir la liste complète des systèmes inactifs : + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} système(s) a/ont bien été abonné(s).</target></trans-unit> 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 c9c0505..51ee373 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 @@ -6344,6 +6344,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} સિસ્ટમ(ઓ)ની સફળતાપૂર્વક ઉમેદવારી કરાઈ.</target></trans-unit> 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 9d2076b..4befb8e 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 @@ -6344,6 +6344,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} सिस्टम में सफलतापूर्वक सदस्यता लिया.</target></trans-unit> 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 016f57e..67f8390 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 @@ -6368,6 +6368,13 @@ Seguite l'url sotto riportato per visualizzare l'elenco completo di sistemi inat + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>Sottoscrizione {0} sistema(i) completata.</target></trans-unit> 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 1e96602..77790f9 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 @@ -6368,6 +6368,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} システムを正常にサブスクライブしました。</target></trans-unit> 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 325698f..8e4d967 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 @@ -6344,6 +6344,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} 시스템을 성공적으로 등록하였습니다.</target></trans-unit> 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 82e3518..65300d9 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 @@ -6346,6 +6346,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>ਸਫਲਤਾਪੂਰਕ ਮੈਂਬਰ ਬਣੇ {0} ਸਿਸਟਮ।</target></trans-unit> 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 482f89c..d7839a4 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 @@ -6356,6 +6356,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>Subscrição bem sucedida {0} sistema(s)</target></trans-unit> 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 5a22352..20965ed 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 @@ -6344,6 +6344,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>Успешно подписано систем: {0}.</target></trans-unit> 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 c2f2492..012cd37 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 @@ -6344,6 +6344,13 @@ url பின்பற்றி செயலிழக்கப்பட்ட + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>வெற்றிகரமாக {0} கணினிகள் சந்தாப்படுத்தப்பட்டன.</target></trans-unit> 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 669481b..0e7919d 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 @@ -6369,6 +6369,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>成功地订阅 {0} 个系统。</target></trans-unit> 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 341c46d..1762fbd 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 @@ -6343,6 +6343,13 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="config_target_systems.subscribeSystems.success"> + <source>Successfully subscribed {0} system(s).</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/configuration/file/CopyFilesCentral.do</context> + <context context-type="paramnotes">Successfully copied file to 7 channels.</context> + </context-group> + <target>{0} 個系統已成功地訂閱了。</target></trans-unit> commit 662220e9cf417c4078f87fe9345cbde010c7131d Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 2 15:19:04 2012 +0200 Revert "removing unused string with trans-id 'preferences.critical-probes.description'" This reverts commit b8ea8d39956e0901c59dbad36d0113db17f5a5ee. 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 1603d15..c8a7fcc 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 @@ -900,6 +900,12 @@ </context-group> <target>Monitoring সংক্রান্ত অবস্থা - গুরুতর প্রোব</target></trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> গুরুতর অবস্থার প্রোবগুলির পূর্বরূপ।</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> 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 10f9b9c..274a654 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 @@ -900,6 +900,12 @@ </context-group> <target>Monitoring-Status - Kritische Probes</target></trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> Eine Vorschau von Probes in kritischem Status.</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 220d148..d53521f 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 @@ -916,6 +916,12 @@ </context-group> </trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + </trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index 43aa932..f8e89cf 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 @@ -900,6 +900,12 @@ </context-group> <target>Estado de monitorización - Sondeos críticos.</target></trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Un resumen de los sondeos cuyo estado es crítico.</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index 5772656..5fdb549 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 @@ -900,6 +900,12 @@ </context-group> <target>Statut de contrôle - Sondes critiques</target></trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> Un aperçu des sondes en état critique.</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> 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 eedead1..be9a64d 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 @@ -900,6 +900,12 @@ </context-group> <target>મોનીટરીંગ પરિસ્થિતિ - ઘાતક ચકાસણીઓ</target></trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> ચકાસણીઓનું પૂર્વદર્શન કે જેઓ ઘાતક સ્થિતિમાં છે.</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> 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 05a498e..b4b7692 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 @@ -900,6 +900,12 @@ </context-group> <target>मॉनिटरिंग स्थिति - गंभीर जांच</target></trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> जांच का पूर्वावलोकन जो कि गंभीर स्थिति में है</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index 8de0501..a21afe5 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 @@ -900,6 +900,12 @@ </context-group> <target>Stato di controllo - Probe critici</target></trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Anteprima dei Probe con uno stato critico 'critical'.</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index 3faa2eb..65b6174 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 @@ -900,6 +900,12 @@ </context-group> <target>モニタリングの状態 - 重大レベルのプローブ</target></trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>重大レベルにあるプローブのプレビューです。</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index 540c1e2..620f273 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 @@ -900,6 +900,12 @@ </context-group> <target>모니터링 상태 - 위험 상태인 프로브</target></trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>위험한 상태인 프로브 미리 보기 </target></trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> 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 7f51c12..02bb447 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 @@ -900,6 +900,12 @@ </context-group> <target>ਨਿਗਰਾਨੀ ਸਥਿਤੀ - ਖਾਸ ਪੜਚੋਲ</target></trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> ਪੜਤਾਲਾਂ ਜੋ ਜਰੂਰੀ ਹਨ ਬਾਰੇ ਸੰਖੇਪ ਜਾਣਕਾਰੀ।</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index 9753ca7..3d6b16d 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 @@ -900,6 +900,12 @@ </context-group> <target>Status do Monitoring - Detecções críticas</target></trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> Uma prévia das detecções que estejam em um estado crítico.</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index e70ede1..7ac2f94 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 @@ -900,6 +900,12 @@ </context-group> <target>Состояние мониторинга - зонды Critical</target></trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> Просмотр зондов в критическом состоянии.</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> 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 b80cbf1..a843917 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 @@ -900,6 +900,12 @@ </context-group> <target>பார்வையிடும் நிலை - சிக்கலான ஆய்வுகள்</target></trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>ஆய்வுகளின் முன்பார்வை சிக்கலான நிலையில் உள்ளது.</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index 2d46afc..f9d6030 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 @@ -900,6 +900,12 @@ </context-group> <target>监测状态 - 重要探测</target></trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>处于 critical 状态的探测预览。</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index c9a7880..fe620e7 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 @@ -900,6 +900,12 @@ </context-group> <target>監控狀態 - 重大偵測</target></trans-unit> + <trans-unit id="preferences.critical-probes.description"> + <source> A preview of probes that are in critical state.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> 處於臨界狀態的偵測一覽。</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> <source>Monitoring Status - Warning Probes</source> commit 13798330d52d068489ce7531cacfe18b0255ca2a Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 2 15:18:40 2012 +0200 Revert "removing unused string with trans-id 'preferences.critical-probes.name'" 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 0915b13..1603d15 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 @@ -893,6 +893,12 @@ </context-group> <target> অত্যাধিক গুরুতর আপডেট ও সংকটজনক অবস্থার সিস্টেমের তালিকা।</target></trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Monitoring সংক্রান্ত অবস্থা - গুরুতর প্রোব</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> 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 fcc3c72..10f9b9c 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 @@ -893,6 +893,12 @@ </context-group> <target> Eine Auflistung jener Systeme mit dem kritischsten Update- und Health-Status.</target></trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Monitoring-Status - Kritische Probes</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> 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 611f096..220d148 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 @@ -909,6 +909,12 @@ </context-group> </trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + </trans-unit> <trans-unit id="preferences.warning-probes.name"> 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 0d67800..43aa932 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 @@ -893,6 +893,12 @@ </context-group> <target>Una lista de los sistemas con las actualizaciones y los estados más críticos.</target></trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Estado de monitorización - Sondeos críticos.</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> 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 03f74b0..5772656 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 @@ -893,6 +893,12 @@ </context-group> <target> Une liste des systèmes avec un statut de santé et de mise à jour le plus critique.</target></trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Statut de contrôle - Sondes critiques</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> 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 bc48234..eedead1 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 @@ -893,6 +893,12 @@ </context-group> <target> ખૂબ ઘાતક સુધારા અને તંદુરસ્તી પરિસ્થિતિ સાથેની સિસ્ટમોની યાદી.</target></trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>મોનીટરીંગ પરિસ્થિતિ - ઘાતક ચકાસણીઓ</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> 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 3ef3831..05a498e 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 @@ -893,6 +893,12 @@ </context-group> <target> बहुत गंभीर अद्यतन और स्वास्थ्य स्थिति के साथ सिस्टम का सूचीकरण.</target></trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>मॉनिटरिंग स्थिति - गंभीर जांच</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> 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 dcc69ee..8de0501 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 @@ -893,6 +893,12 @@ </context-group> <target>Un elenco di sistemi con gli aggiornamenti più importanti insieme al tipo di stato.</target></trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Stato di controllo - Probe critici</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> 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 70a36ab..3faa2eb 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 @@ -893,6 +893,12 @@ </context-group> <target>最も重大レベルの更新と健全性の状態を示すシステムのリストです。</target></trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>モニタリングの状態 - 重大レベルのプローブ</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> 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 d27559b..540c1e2 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 @@ -893,6 +893,12 @@ </context-group> <target> 중요 업데이트 및 시스템 상태에 대한 시스템 목록 </target></trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>모니터링 상태 - 위험 상태인 프로브</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> 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 ea39de8..7f51c12 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 @@ -893,6 +893,12 @@ </context-group> <target> ਜਿਆਦਾ ਜਰੂਰੀ ਅੱਪਡੇਟ ਅਤੇਲਤ ਸਥਿਤੀ ਸਮੇਤ ਸਿਸਟਮਾਂ ਦੀ ਸੂਚੀ।</target></trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>ਨਿਗਰਾਨੀ ਸਥਿਤੀ - ਖਾਸ ਪੜਚੋਲ</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> 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 eadde5f..9753ca7 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 @@ -893,6 +893,12 @@ </context-group> <target>Uma listagem dos sistemas com os estados de integridade e atualização mais críticos.</target></trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Status do Monitoring - Detecções críticas</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> 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 b915c18..e70ede1 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 @@ -893,6 +893,12 @@ </context-group> <target> Список систем с наиболее критичными обновлениями и состоянием.</target></trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Состояние мониторинга - зонды Critical</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> 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 2ed5692..b80cbf1 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 @@ -893,6 +893,12 @@ </context-group> <target>மிக சிக்கலான மேம்படுத்தல் மற்றும் நல நிலை ஆகியவற்றைக்கொண்ட கணினிகளின் பட்டியல்.</target></trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>பார்வையிடும் நிலை - சிக்கலான ஆய்வுகள்</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> 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 e2343d9..2d46afc 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 @@ -893,6 +893,12 @@ </context-group> <target>包括最关键更新和健康状态的系统列表。</target></trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>监测状态 - 重要探测</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> 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 6bd15a0..c9a7880 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 @@ -893,6 +893,12 @@ </context-group> <target> 列出有重大更新與健康狀態的系統清單。</target></trans-unit> + <trans-unit id="preferences.critical-probes.name"> + <source>Monitoring Status - Critical Probes</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>監控狀態 - 重大偵測</target></trans-unit> <trans-unit id="preferences.warning-probes.name"> commit be0c0c158e0a45c78e4305df51d5d9ebf3a64592 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 2 15:17:58 2012 +0200 Revert "removing unused string with trans-id 'preferences.critical-systems.description'" 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 8a2cd96..0915b13 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 @@ -886,6 +886,12 @@ </context-group> <target>অত্যন্ত গুরুতর সিস্টেম</target></trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 16154bc..fcc3c72 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 @@ -886,6 +886,12 @@ </context-group> <target>Kritische Systeme</target></trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> Eine Auflistung jener Systeme mit dem kritischsten Update- und Health-Status.</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 bc3eb46..611f096 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 @@ -902,6 +902,12 @@ </context-group> </trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + </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 719fbf9..0d67800 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 @@ -886,6 +886,12 @@ </context-group> <target>Sistemas más críticos</target></trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Una lista de los sistemas con las actualizaciones y los estados más críticos.</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 befbc7f..03f74b0 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 @@ -886,6 +886,12 @@ </context-group> <target>Systèmes les plus critiques</target></trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> Une liste des systèmes avec un statut de santé et de mise à jour le plus critique.</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 99148e2..bc48234 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 @@ -886,6 +886,12 @@ </context-group> <target>ખૂબ જટિલ સિસ્ટમો</target></trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 5d142c1..3ef3831 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 @@ -886,6 +886,12 @@ </context-group> <target>सर्वाधिक गंभीर सिस्टम</target></trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 807ab16..dcc69ee 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 @@ -886,6 +886,12 @@ </context-group> <target>Sistemi più critici</target></trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Un elenco di sistemi con gli aggiornamenti più importanti insieme al tipo di stato.</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 1e596a8..70a36ab 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 @@ -886,6 +886,12 @@ </context-group> <target>最も重要なシステム</target></trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 5d8511f..d27559b 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 @@ -886,6 +886,12 @@ </context-group> <target>가장 중요한 시스템</target></trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 ca8add2..ea39de8 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 @@ -886,6 +886,12 @@ </context-group> <target>ਵਧੇਰੇ ਨਾਜੁਕ ਸਿਸਟਮ</target></trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 a10aadf..eadde5f 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 @@ -886,6 +886,12 @@ </context-group> <target>Sistemas Mais Críticos</target></trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Uma listagem dos sistemas com os estados de integridade e atualização mais críticos.</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 ccadaf9..b915c18 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 @@ -886,6 +886,12 @@ </context-group> <target>Наиболее критичные системы</target></trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 68e27ec..2ed5692 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 @@ -886,6 +886,12 @@ </context-group> <target>மிக அவசியமான கணினிகள்</target></trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 fd65a10..e2343d9 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 @@ -886,6 +886,12 @@ </context-group> <target>最关键的系统</target></trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 9c41312..6bd15a0 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 @@ -886,6 +886,12 @@ </context-group> <target>處於最高臨界狀態的系統</target></trans-unit> + <trans-unit id="preferences.critical-systems.description"> + <source> A listing of the systems with the most critical update and health status.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> 列出有重大更新與健康狀態的系統清單。</target></trans-unit> commit 2f5268e92b9adcb7c2e3cf3182c1d10dd1ba2786 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 2 15:17:35 2012 +0200 Revert "removing unused string with trans-id 'preferences.critical-systems.name'" 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 d53fda1..8a2cd96 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 @@ -879,6 +879,12 @@ <target> @@PRODUCT_NAME@@-র ইউজার ইন্টারফেসের বিভিন্ন অংশের কর্ম অনুসারে নির্দেশকারী লিঙ্কের তালিকা।</target></trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 7359e7d..16154bc 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 @@ -879,6 +879,12 @@ <target> Ein taskorientiertes Men&uuml; mit Schnelllinks zu verschiedenen Bereichen der @@PRODUCT_NAME@@-Benutzeroberfl&auml;che.</target></trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Kritische Systeme</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 2b1d9d3..bc3eb46 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 @@ -895,6 +895,12 @@ </trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + </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 de20b32..719fbf9 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 @@ -879,6 +879,12 @@ <target>Un menú orientado a tareas con enlaces a diferentes áreas de la interfaz del usuario de @@PRODUCT_NAME@@.</target></trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Sistemas más críticos</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 b89ae37..befbc7f 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 @@ -879,6 +879,12 @@ <target> Un menu orienté tâches de liens rapides vers les différentes zones de l'interface utilisateur @@PRODUCT_NAME@@.</target></trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Systèmes les plus critiques</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 bcb9a2b..99148e2 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 @@ -879,6 +879,12 @@ <target> @@PRODUCT_NAME@@ વપરાશકર્તા ઈન્ટરફેસના વિવિધ વિસ્તારોની તુરંત કડીઓનું બાબત-લગતું મેનુ.</target></trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 e3b9a21..5d142c1 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 @@ -879,6 +879,12 @@ <target>@@PRODUCT_NAME@@ उपयोक्ता अंतरफलक के अलग क्षेत्रों में द्रुत लिंक की कार्य अभिमुख मेनू.</target></trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 60abe3d..807ab16 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 @@ -879,6 +879,12 @@ <target>Un menu orientato sui compiti di quick links per diverse aree dell'interfaccia utente di @@PRODUCT_NAME@@.</target></trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Sistemi più critici</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 78592ea..1e596a8 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 @@ -879,6 +879,12 @@ <target>@@PRODUCT_NAME@@ ユーザーインターフェイスの別の場所へのリンクを表示するタスク中心のメニューです。</target></trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 f9e240e..5d8511f 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 @@ -879,6 +879,12 @@ <target>@@PRODUCT_NAME@@ 사용자 인터페이스의 다른 위치에 바로 연결하는 작업 중심적인 메뉴 </target></trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 df91f02..ca8add2 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 @@ -879,6 +879,12 @@ <target>@@PRODUCT_NAME@@ ਉਪਭੋਗੀ ਇੰਟਰਫੇਸ ਦੇ ਵੱਖਰੇ ਖੇਤਰ ਨੂੰ ਕੁਇੱਕ ਲਿੰਕ ਦਾ ਕਾਰਜ ਦਾ ਅਨੁਸਾਰੀ ਮੇਨੂ।</target></trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 2441811..a10aadf 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 @@ -879,6 +879,12 @@ <target> Um menu orientado a tarefas contendo links rápidos à diversas áreas da interface do @@PRODUCT_NAME@@.</target></trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Sistemas Mais Críticos</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 14c7eb7..ccadaf9 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 @@ -879,6 +879,12 @@ <target> Меню задач состоит из ссылок быстрого доступа к различным разделам интерфейса @@PRODUCT_NAME@@.</target></trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 c8a8482..68e27ec 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 @@ -879,6 +879,12 @@ <target>பணி சார்ந்த பட்டியில் விரைவு இணைப்புகள் @@PRODUCT_NAME@@ பயனர் இடைமுகத்தின் வெவ்வேறு இடங்களை வேறுபடுத்துகிறது.</target></trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 4621821..fd65a10 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 @@ -879,6 +879,12 @@ <target>到 @@PRODUCT_NAME@@ 用户界面不同区域的快速链接任务导向菜单。</target></trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <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 7860397..9c41312 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 @@ -879,6 +879,12 @@ <target> 任務導向的選單，讓您可以快速的連接到不同領域的 @@PRODUCT_NAME@@ 使用者介面。</target></trans-unit> + <trans-unit id="preferences.critical-systems.name"> + <source>Most Critical Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>處於最高臨界狀態的系統</target></trans-unit> commit 93f6f671a39b6519f92c980518c2db92e3b65152 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 2 15:17:06 2012 +0200 Revert "removing unused string with trans-id 'preferences.inactive-systems.name'" This reverts commit ed106eaa381941329ffd8e443dc5973a1ee241de. 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 b6bddbb..d53fda1 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 @@ -927,6 +927,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>নিষ্ক্রিয় সিস্টেম</target></trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> 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 16e989c..7359e7d 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 @@ -927,6 +927,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Inaktive Systeme</target></trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 672a857..2b1d9d3 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 @@ -943,6 +943,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + </trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index d338825..de20b32 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 @@ -927,6 +927,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Sistemas inactivos</target></trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index 1ffc7c2..b89ae37 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 @@ -927,6 +927,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Systèmes inactifs</target></trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> 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 8cf75ab..bcb9a2b 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 @@ -927,6 +927,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>અસક્રિય સિસ્ટમો</target></trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> 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 3ef522a..e3b9a21 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 @@ -927,6 +927,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>निष्क्रिय सिस्टम</target></trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index e2a9b7d..60abe3d 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 @@ -927,6 +927,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Sistemi inattivi</target></trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index 378c2ef..78592ea 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 @@ -927,6 +927,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>休止中のシステム</target></trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index d77c4e4..f9e240e 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 @@ -927,6 +927,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>비활성 시스템</target></trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> 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 68c05bc..df91f02 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 @@ -927,6 +927,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>ਨਾ-ਸਰਗਰਮ ਸਿਸਟਮ</target></trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index 34e7995..2441811 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 @@ -927,6 +927,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Sistemas Inativos</target></trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index f85b8d7..14c7eb7 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 @@ -927,6 +927,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Неактивные системы</target></trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> 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 afc5d79..c8a8482 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 @@ -927,6 +927,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>செயலிழக்கப்பட்ட கணினிகள்</target></trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index 512b654..4621821 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 @@ -927,6 +927,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>不活跃的系统</target></trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index 27a28ee..7860397 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 @@ -927,6 +927,12 @@ + <trans-unit id="preferences.inactive-systems.name"> + <source>Inactive Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>非啟用中的系統</target></trans-unit> <trans-unit id="preferences.inactive-systems.description"> <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> commit 767d35812bab2be2bdc8a13c40f3acb4cba14204 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 2 15:16:36 2012 +0200 Revert "removing unused string with trans-id 'preferences.inactive-systems.description'" 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 d9de500..b6bddbb 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 @@ -928,6 +928,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> @@PRODUCT_NAME@@-এ নিবন্ধিত যে সমস্ত সিস্টেম সম্প্রতি সংযোগ করেনি সেগুলির তালিকা নির্মাণ করে।</target></trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> 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 6288184..16e989c 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 @@ -928,6 +928,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> Listet die bei @@PRODUCT_NAME@@ registrierten Systeme auf, die k&uuml;rzlich aufgeh&ouml;rt haben, sich anzumelden.</target></trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 784cf4b..672a857 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 @@ -944,6 +944,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + </trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index 902a99e..d338825 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 @@ -928,6 +928,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>Lista los sistemas registrados de @@PRODUCT_NAME@@ desconectados recientemente.</target></trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index d60f87d..1ffc7c2 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 @@ -928,6 +928,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> Liste les systèmes enregistrés à @@PRODUCT_NAME@@ qui ont récemment arrêté de se connecter.</target></trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> 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 7ff4ed0..8cf75ab 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 @@ -928,6 +928,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> રજીસ્ટર થયેલ @@PRODUCT_NAME@@ સિસ્ટમોની યાદી આપે છે કે જેણે છેલ્લે ચકાસણી કરવાનું અટકાવી દીધું છે.</target></trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> 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 6be4453..3ef522a 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 @@ -928,6 +928,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> पंजीकृत @@PRODUCT_NAME@@ सिस्टम की सूची जो कि हाल में चेकइन करने से रूक गया है.</target></trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index 3d9b89b..e2a9b7d 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 @@ -928,6 +928,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> Elenca i sistemi @@PRODUCT_NAME@@ registrati che non hanno eseguito recentemente un check in.</target></trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index 2d801e8..378c2ef 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 @@ -928,6 +928,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> 最近チェックインを停止した登録済みの @@PRODUCT_NAME@@ システムを一覧表示します。</target></trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index f5015fc..d77c4e4 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 @@ -928,6 +928,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>@@PRODUCT_NAME@@에 등록된 시스템 중 최근에 접속 중지한 시스템 목록 보기 </target></trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> 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 7561515..68c05bc 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 @@ -928,6 +928,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>@@PRODUCT_NAME@@ ਤੇ ਰਜਿਸਟਰ ਕੀਤੇ ਸਿਸਟਮ ਵੇਖਾਓ ਜਿਨਾਂ ਦੀ ਜਾਂਚ ਹੁਣੇ ਰੁਕੀ ਹੈ।</target></trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index 60bfff2..34e7995 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 @@ -928,6 +928,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> Lista sistemas registrados no @@PRODUCT_NAME@@ que recentemente pararam de se autenticar.</target></trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index 7904443..f85b8d7 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 @@ -928,6 +928,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> Перечисляет зарегистрированные в @@PRODUCT_NAME@@ системы, которые некоторое время не выполняли вход.</target></trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> 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 7c4a222..afc5d79 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 @@ -928,6 +928,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>சமீபத்தில் நிறுத்தப்பட்டு பதிவு செய்யப்பட்ட @@PRODUCT_NAME@@ கணினிகளை பட்டியலிடுகிறது.</target></trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index 2a08bef..512b654 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 @@ -928,6 +928,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target>在 @@PRODUCT_NAME@@ 注册但目前却停止登录的系统列表。</target></trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index b86f66f..27a28ee 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 @@ -928,6 +928,12 @@ + <trans-unit id="preferences.inactive-systems.description"> + <source> Lists the registered @@PRODUCT_NAME@@ systems that recently stopped checking in.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserPreferences</context> + </context-group> + <target> 列出已註冊 @@PRODUCT_NAME@@，並且最近停止登入的系統。</target></trans-unit> <trans-unit id="preferences.pending-actions.name"> <source>Recently Scheduled Actions</source> commit 096d921dfdba55d97168f23f2b1ccb878bf93e13 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 2 15:14:43 2012 +0200 Revert "removing unused string with trans-id 'sdc.config.differing.files_1'" 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 fa042f2..0d388a9 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 @@ -6711,6 +6711,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + <target>1-টি ফাইল, সিস্টেমের সর্বমেট 1-টি ফাইলের মধ্যে, @@PRODUCT_NAME@@-পরিচালিত ফাইল থেকে পৃথক</target></trans-unit> </group> 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 eb6343f..df879f3 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 @@ -6736,6 +6736,9 @@ Folgen Sie dieser URL f&uuml;r die vollst&auml;ndige Liste inaktiver Sys + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + <target>1 von 1 Datei auf dem System unterschied sich von den von @@PRODUCT_NAME@@ gemanagten Dateien</target></trans-unit> </group> 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 b2f8173..b20b2f6 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 @@ -6802,6 +6802,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + </trans-unit> </group> 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 988249e..80faf7d 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 @@ -6730,6 +6730,9 @@ Vaya a esta dirección para ver la lista completa de sistemas inactivos: + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + <target>1 de 1 archivo en el sistema difiere de los archivos administrados de @@PRODUCT_NAME@@.</target></trans-unit> </group> 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 95a69a9..4fddac5 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 @@ -6732,6 +6732,9 @@ Suivez cet url pour obtenir la liste complète des systèmes inactifs : + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + <target>1 de 1 fichier sur le système diffère des fichiers gérés par @@PRODUCT_NAME@@</target></trans-unit> </group> 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 eb10d3f..c9c0505 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 @@ -6705,6 +6705,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + <target>સિસ્ટમ પર ૧ માંની ૧ ફાઈલ @@PRODUCT_NAME@@-વ્યવસ્થાપિત ફાઈલોથી અલગ પડી</target></trans-unit> </group> 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 56ab912..9d2076b 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 @@ -6705,6 +6705,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + <target>@@PRODUCT_NAME@@ प्रबंधित फाइल से सिस्टम पर 1 का 1 फाइल भिन्न है.</target></trans-unit> </group> 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 a89ffc3..016f57e 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 @@ -6729,6 +6729,9 @@ Seguite l'url sotto riportato per visualizzare l'elenco completo di sistemi inat + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + <target>1 di 1 file presente sul sistema differisce dai file gestiti da @@PRODUCT_NAME@@</target></trans-unit> </group> 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 053da5f..1e96602 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 @@ -6729,6 +6729,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + <target>システム上の 1 ファイルのうちの 1 つが @@PRODUCT_NAME@@ 管理ファイルと異なっていました。</target></trans-unit> </group> 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 edf1786..325698f 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 @@ -6705,6 +6705,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + <target>시스템에 있는 1 개 중 1개의 파일이 @@PRODUCT_NAME@@-관리 파일과 다릅니다. </target></trans-unit> </group> 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 c06581c..82e3518 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 @@ -6707,6 +6707,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + <target>ਸਿਸਟਮ ਉੱਪਰ 1 ਫਾਇਲ ਦਾ 1 @@PRODUCT_NAME@@-ਪਰਬੰਧਿਤ ਫਾਇਲਾਂ ਤੋਂ ਵੱਖਰੀ ਹੈ</target></trans-unit> </group> 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 9269da8..482f89c 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 @@ -6717,6 +6717,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + <target>1 de 1 arquivo no sistema diferiu dos arquivos Gerenciados pelo @@PRODUCT_NAME@@</target></trans-unit> </group> 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 60d3797..5a22352 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 @@ -6705,6 +6705,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + <target>1 из 1 файла в системе отличается от файлов под управлением @@PRODUCT_NAME@@.</target></trans-unit> </group> 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 333ddc9..c2f2492 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 @@ -6705,6 +6705,9 @@ url பின்பற்றி செயலிழக்கப்பட்ட + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + <target>@@PRODUCT_NAME@@-மேலாண்மை செய்யப்பட்ட கோப்புகளிலிருந்து கணினியில் 1 இல் 1 கோப்பு வேறுபடுகிறது.</target></trans-unit> </group> 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 681e341..669481b 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 @@ -6730,6 +6730,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + <target>系统中 1 文件中的 1 个与 @@PRODUCT_NAME@@ 管理的文件不同。</target></trans-unit> </group> 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 67c5e5c..341c46d 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 @@ -6704,6 +6704,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.differing.files_1"> + <source>1 of 1 file on the system differed from the @@PRODUCT_NAME@@-Managed files</source> + <target>系統上有 1 個檔案中的 1 個檔案與 @@PRODUCT_NAME@@ 所管理的檔案不同。</target></trans-unit> </group> commit fb93bb25c9c76b7d9bbf4e9f1f65975819116987 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 2 15:14:08 2012 +0200 Revert "removing unused string with trans-id 'sdc.config.diff.files_1_dirs_0_symlinks_0'" 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 a1fa5bf..fa042f2 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 @@ -6689,6 +6689,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + <target></target></trans-unit> 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 da872e4..eb6343f 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 @@ -6714,6 +6714,9 @@ Folgen Sie dieser URL f&uuml;r die vollst&auml;ndige Liste inaktiver Sys + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + <target>{0} von 1 Datei auf dem System wurde erfolgreich mit @@PRODUCT_NAME@@-verwalteten Dateien verglichen. [<a href="{6}">Details anzeigen</a>]</target></trans-unit> 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 f9881cd..b2f8173 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 @@ -6780,6 +6780,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + </trans-unit> 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 567f347..988249e 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 @@ -6708,6 +6708,9 @@ Vaya a esta dirección para ver la lista completa de sistemas inactivos: + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + <target>{0} de 1 archivo en el sistema fue comparado exitosamente con los archivos manejados por @@PRODUCT_NAME@@. [<a href="{6}">Ver detalles</a>]</target></trans-unit> 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 a0610e9..95a69a9 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 @@ -6710,6 +6710,9 @@ Suivez cet url pour obtenir la liste complète des systèmes inactifs : + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + <target>{0} parmi 1 lien symbolique du système a été comparé avec succès pour les fichiers @@PRODUCT_NAME@@-Managed. [<a href="{6}">Voir détails</a>]</target></trans-unit> 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 92e4d0c..eb10d3f 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 @@ -6683,6 +6683,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + <target></target></trans-unit> 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 a001e34..56ab912 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 @@ -6683,6 +6683,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + <target></target></trans-unit> 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 7a0bcd6..a89ffc3 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 @@ -6707,6 +6707,9 @@ Seguite l'url sotto riportato per visualizzare l'elenco completo di sistemi inat + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + <target></target></trans-unit> 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 bbc9c77..053da5f 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 @@ -6707,6 +6707,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + <target>システム上の 1 個のファイルのうちの {0} 個が、@@PRODUCT_NAME@@ によって管理されたファイルと正常に比較されました。[<a href="{6}">詳細の表示</a>]</target></trans-unit> 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 a77bc9c..edf1786 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 @@ -6683,6 +6683,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + <target></target></trans-unit> 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 93ff049..c06581c 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 @@ -6685,6 +6685,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + <target></target></trans-unit> 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 c4ed872..9269da8 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 @@ -6695,6 +6695,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + <target>{0} de 1 arquivo no sistema foram bem sucedidos quando comparados com os arquivos @@PRODUCT_NAME@@-Gerenciados. [<a href="{6}">View Details</a>]</target></trans-unit> 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 3db6c93..60d3797 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 @@ -6683,6 +6683,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + <target></target></trans-unit> 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 08c7e84..333ddc9 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 @@ -6683,6 +6683,9 @@ url பின்பற்றி செயலிழக்கப்பட்ட + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + <target></target></trans-unit> 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 75d1896..681e341 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 @@ -6708,6 +6708,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + <target>系统里 1 个文件的 {0} 个成功地和 @@PRODUCT_NAME@@ 管理的文件进行了比较。[<a href="{6}">查看详情</a>]</target></trans-unit> 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 a751da0..67c5e5c 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 @@ -6682,6 +6682,9 @@ Follow this url to see the full list of inactive systems: + <trans-unit id="sdc.config.diff.files_1_dirs_0_symlinks_0"> + <source>{0} of 1 file on the system was successfully compared with @@PRODUCT_NAME@@-Managed files. [<a href="{6}">View Details</a>]</source> + <target></target></trans-unit> commit 16f1f769eac0c560a0435b7fee65014bcbf43663 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 2 15:12:55 2012 +0200 Revert "removing unused string with trans-id 'userlist.jsp.disabled'" This reverts commit b519ff2b336abc74e57b7657067d9301f8266b11. 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 7c6b5fd..d9de500 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 @@ -1661,6 +1661,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>সক্রিয়</target></trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 9604073..6288184 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 @@ -1661,6 +1661,12 @@ dr&uuml;cken und k&ouml;nnen sich nicht wieder einloggen</b& </context-group> <target>Aktiv</target></trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <target>Deaktiviert</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 660adc9..784cf4b 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 @@ -1675,6 +1675,12 @@ button below, and will be unable to log back in.</source> </context-group> </trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + </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 b6def6b..902a99e 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 @@ -1662,6 +1662,12 @@ del rol de Administrador de la organización.</target></trans-unit> </context-group> <target>Activo</target></trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <target>Desactivado</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 d76fa24..d60f87d 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 @@ -1661,6 +1661,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>Actif</target></trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <target>Désactivé</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 eae171d..7ff4ed0 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 @@ -1661,6 +1661,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>સક્રિય</target></trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 0990699..6be4453 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 @@ -1661,6 +1661,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>सक्रिय</target></trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 db898f0..3d9b89b 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 @@ -1661,6 +1661,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>Attivo</target></trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <target>Disattivato</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 6c12d3d..2d801e8 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 @@ -1661,6 +1661,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>アクティブ</target></trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 148c2a4..f5015fc 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 @@ -1661,6 +1661,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>활성화</target></trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 6877ddf..7561515 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 @@ -1661,6 +1661,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>ਸਰਗਰਮ</target></trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 7cb1559..60bfff2 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 @@ -1661,6 +1661,12 @@ abaixo e não poderá mais se autenticar.</target></trans-uni </context-group> <target>Ativo</target></trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <target>Desativar</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 6ba777a..7904443 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 @@ -1661,6 +1661,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>Активно</target></trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 a7b4b39..7c4a222 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 @@ -1661,6 +1661,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>செயல்</target></trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 1cc8da5..2a08bef 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 @@ -1661,6 +1661,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>激活的</target></trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 3345e56..b86f66f 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 @@ -1661,6 +1661,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>啟用</target></trans-unit> + <trans-unit id="userlist.jsp.disabled"> +<source>Deactivated</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <target>停用</target></trans-unit>  commit 5deec60e4111430915926b94997fa12c62e950ee Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Apr 2 15:12:32 2012 +0200 Revert "removing unused string with trans-id 'userlist.jsp.enabled'" 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 9bce980..7c6b5fd 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 @@ -1654,6 +1654,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>অবস্থা</target></trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 d697edf..9604073 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 @@ -1654,6 +1654,12 @@ dr&uuml;cken und k&ouml;nnen sich nicht wieder einloggen</b& </context-group> <target>Status</target></trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <target>Aktiv</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 4fc5d98..660adc9 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 @@ -1668,6 +1668,12 @@ button below, and will be unable to log back in.</source> </context-group> </trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + </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 8c9a211..b6def6b 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 @@ -1655,6 +1655,12 @@ del rol de Administrador de la organización.</target></trans-unit> </context-group> <target>Estado</target></trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <target>Activo</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 3b29d8e..d76fa24 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 @@ -1654,6 +1654,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>Statut</target></trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <target>Actif</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 5714b8d..eae171d 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 @@ -1654,6 +1654,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>પરિસ્થિતિ</target></trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 ca0420d..0990699 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 @@ -1654,6 +1654,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>स्थिति</target></trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 5dbf437..db898f0 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 @@ -1654,6 +1654,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>Stato</target></trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <target>Attivo</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 5d2bc71..6c12d3d 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 @@ -1654,6 +1654,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>状態</target></trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 171610d..148c2a4 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 @@ -1654,6 +1654,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>상태</target></trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 0d5cb3e..6877ddf 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 @@ -1654,6 +1654,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>ਹਾਲਤ</target></trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 af4cd4f..7cb1559 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 @@ -1654,6 +1654,12 @@ abaixo e não poderá mais se autenticar.</target></trans-uni </context-group> <target>Estado</target></trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <target>Ativo</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 3eecc1d..6ba777a 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 @@ -1654,6 +1654,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>Статус</target></trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 d0c76ad..a7b4b39 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 @@ -1654,6 +1654,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>நிலை</target></trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 b438bb5..1cc8da5 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 @@ -1654,6 +1654,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>状态</target></trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <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 cf8bae5..3345e56 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 @@ -1654,6 +1654,12 @@ button below, and will be unable to log back in.</source> </context-group> <target>狀態</target></trans-unit> + <trans-unit id="userlist.jsp.enabled"> +<source>Active</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/UserList</context> + </context-group> + <target>啟用</target></trans-unit>

1 0

monitoring/NOCpulsePlugins
by Milan Zazrivec 02 Apr '12

02 Apr '12

monitoring/NOCpulsePlugins/Oracle/IdleSessions.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 96ffe1f15c1017f079000fae6c5e10b21729aa40 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Mon Apr 2 12:06:47 2012 +0200 518985 - fix ORA-00918: column ambiguously defined diff --git a/monitoring/NOCpulsePlugins/Oracle/IdleSessions.pm b/monitoring/NOCpulsePlugins/Oracle/IdleSessions.pm index 81bbf9f..54b8900 100644 --- a/monitoring/NOCpulsePlugins/Oracle/IdleSessions.pm +++ b/monitoring/NOCpulsePlugins/Oracle/IdleSessions.pm @@ -17,7 +17,7 @@ sub run { my $row = $ora->fetch_first(q{select count(*) as COUNT from v$session_wait a, v$session b - where event = 'SQL*Net message from client' + where a.event = 'SQL*Net message from client' and a.seconds_in_wait >= ? and a.sid = b.sid and b.username is not null

1 0

backend/satellite_tools
by Jan Pazdziora 02 Apr '12

02 Apr '12

backend/satellite_tools/spacewalk-remove-channel.sgml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1c71bd72aa2576b54d2a97743b122fba8caaccb5 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Mon Apr 2 10:32:05 2012 +0200 Fixing typo in spacewalk-remove-channel man page. diff --git a/backend/satellite_tools/spacewalk-remove-channel.sgml b/backend/satellite_tools/spacewalk-remove-channel.sgml index e4e9a43..0e5e704 100644 --- a/backend/satellite_tools/spacewalk-remove-channel.sgml +++ b/backend/satellite_tools/spacewalk-remove-channel.sgml @@ -20,7 +20,7 @@ Removes a channel from an RHN Satellite or Spacewalk server. <RefSynopsisDiv> <Synopsis> <cmdsynopsis> - <command>spaceawlk-remove-channel</command> + <command>spacewalk-remove-channel</command> <arg>options <replaceable>...</replaceable></arg> <arg>-c<replaceable>CHANNEL_LABEL</replaceable></arg> <arg>--mount-point=<replaceable>CHANNEL_LABEL</replaceable></arg>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits April 2012