java/code/src/com/redhat/rhn/common/hibernate/LookupException.java | 25 +++-------
java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java | 20 ++++++++
java/code/src/com/redhat/rhn/domain/token/TokenFactory.java | 6 --
java/code/src/com/redhat/rhn/frontend/action/BaseEditAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/GenericIndexAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/SearchAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/audit/AuditAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/audit/AuditMachineAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/BaseChannelTreeAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/channel/ChannelEntitlementSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/channel/ChannelErrataAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/ChannelFamilyTreeAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/ChannelPackagesAction.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/channel/ChannelSubscribedAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverviewAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java | 9 ++-
java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsConfirmAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddErrataAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddConfirmAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesRemoveAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java | 9 ++-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 7 +-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataIndexAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataRemoveAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ListErrataAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ManageChannelsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/PatchSetListAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataPackagesAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java | 9 ++-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoListSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/channel/ssm/SelectChannelAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/channel/test/AllChannelTreeActionTest.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/channel/test/ChannelEntitlementSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/channel/test/RetiredChannelTreeActionTest.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/configuration/channel/BaseCopyToAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelDeployConfirmAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelOverviewAction.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelOverviewTasks.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/configuration/channel/DeleteChannelAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteFileAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteRevisionAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/configuration/files/LocalRevisionDeployAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSubmit.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/configuration/overview/GlobalConfigChannelList.java | 7 +-
java/code/src/com/redhat/rhn/frontend/action/configuration/overview/ManagedSystemsList.java | 7 +-
java/code/src/com/redhat/rhn/frontend/action/configuration/overview/Overview.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ViewDiffResultAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesListSetupTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelSystemsListSetupTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/configuration/test/GlobalConfigChannelListTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/configuration/test/GlobalConfigFileListTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/configuration/test/LocalConfigFileListTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/configuration/test/ManageRevisionActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/configuration/test/ManagedSystemsListTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/errata/AddPackagesAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/errata/AddPackagesConfirmAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsSetupAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/errata/BaseDeleteErrataAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/BaseErrataListSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/errata/BaseErrataSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/ChannelSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/errata/CloneConfirmAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/CloneErrataAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/CreateSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/DeleteBugAction.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataDetailsSetupAction.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataListBaseAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataPackagesSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java | 9 ++-
java/code/src/com/redhat/rhn/frontend/action/errata/ListPackagesSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/errata/NotifyAction.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/errata/PublishedErrataAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/RemovePackagesSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/errata/UnpublishedErrataAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/test/AffectedSystemsActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/test/AffectedSystemsSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/test/BaseErrataConfirmSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/test/BaseErrataSetupActionTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelActionTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelSetupActionTest.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneErrataActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/test/DeleteBugActionTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/errata/test/EditActionTest.java | 17 +++---
java/code/src/com/redhat/rhn/frontend/action/errata/test/ListPackagesSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/test/NotifyActionTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/errata/test/NotifySetupActionTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/errata/test/PublishedDeleteConfirmSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/errata/test/UnpublishedDeleteConfirmSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/groups/BaseListAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/groups/CreateGroupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/help/ChatAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java | 9 ++-
java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/keys/BaseCryptoKeyEditAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/keys/CryptoKeysListSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/kickstart/BaseKickstartEditAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartAdvancedOptionsAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCloneAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeDeleteAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartOverviewAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVariableAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartsSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/kickstart/cobbler/CobblerSnippetListSetupAction.java | 8 +--
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartsSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java | 2
java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/monitoring/BaseProbeSuiteEditAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteListProbesSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteListSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuitesRemoveAction.java | 7 ++
java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseFilterEditAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseMethodEditAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java | 11 ++--
java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterListSetupActionTest.java | 2
java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodsSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteActionTest.java | 9 ++-
java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteProbeEditActionTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsEditActionTest.java | 10 ++--
java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsSetupActionTest.java | 2
java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuitesRemoveSetupActionTest.java | 2
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDetailsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSystemSubscriptionsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgTrustDetailsAction.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrganizationAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrganizationTrustAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/multiorg/SatAdminAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/multiorg/SatRoleConfirm.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/multiorg/SatUserListAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementDetailsAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementSubscriptionsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementDetailsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementsAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/multiorg/UserListSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java | 8 ++-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackageListAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackagesDeleteConfirmAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchSetAction.java | 7 ++
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchSetSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageChangeLogAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/SolarisPatchSetListSetupAction.java | 7 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchInstallAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchInstallSetupAction.java | 8 ++-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchListAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchListSetupAction.java | 7 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/test/PatchListSetupTest.java | 2
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CreateProfileAction.java | 7 ++
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/DeleteProfileAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/PackageListAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ProfileDetailsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ProfilesListAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ShowProfileAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageInstallationAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageVerifyAction.java | 5 --
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectRemovePackagesAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectUpgradePackagesAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectVerifyPackagesAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleRemovePackagesActionTest.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleVerifyPackagesActionTest.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectRemovePackagesActionTest.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectVerifyPackagesActionTest.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/test/InstallPatchSetSetupTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/test/SolarisPatchSetListSetupTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/satellite/CertificateConfigAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/satellite/RestartAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/satellite/TaskStatusAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/satellite/test/MonitoringConfigActionTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/schedule/ActionDetailsSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/schedule/ActionSystemsSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/schedule/ArchivedActionsSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/schedule/BaseScheduledListAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedSystemsAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedSystemsSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/schedule/InProgressSystemsAction.java | 7 ++
java/code/src/com/redhat/rhn/frontend/action/schedule/PackageListSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/schedule/test/ActionSystemsSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedSystemsSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/ssm/BaseViewLogAction.java | 5 --
java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/ssm/MigrateSystemsAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/ssm/MiscIndexAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogDetailsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemEditAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemListSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemsAction.java | 7 +-
java/code/src/com/redhat/rhn/frontend/action/systems/ErrataConfirmSetupAction.java | 7 +-
java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java | 7 ++
java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/systems/SSMDeleteSystemsConfirm.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateHardwareProfileConfirm.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateSoftwareProfileConfirm.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/SystemGroupListSetupAction.java | 9 ++-
java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java | 8 +--
java/code/src/com/redhat/rhn/frontend/action/systems/audit/XccdfDetailsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CreateCustomKeyAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CustomKeyListAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/customkey/DeleteCustomKeyAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/customkey/UpdateCustomKeyAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsCompareAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/EligibleFlexGuestAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/FlexGuestAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/VirtualizationEntitlementsAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeEditAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDeleteAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDetailsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbesListSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java | 17 +++---
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDeleteActionTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDetailsActionTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeEditActionTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbesListSetupActionTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/PreservationListDeleteSubmitAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListConfirmDeleteActionTest.java | 2
java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListDeleteSubmitActionTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/AddToSSMAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/DeleteCustomDataAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/ListCustomDataAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/NoteListAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/RemoveFromSSMAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDeleteConfirmAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteDeleteAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java | 7 +-
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/UpdateCustomDataAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemDetailsEditActionTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/test/RegisteredSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java | 10 ++--
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java | 11 ++--
java/code/src/com/redhat/rhn/frontend/action/test/LoginSetupActionTest.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyPackagesAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/user/AddressesAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/user/ChangeEmailSetupAction.java | 5 +-
java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/user/DisableSelfAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/user/DisableSelfConfirmAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/user/DisableUserSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/user/DisabledListSetupAction.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/user/EditAddressSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java | 6 +-
java/code/src/com/redhat/rhn/frontend/action/user/EnableUserSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/user/EnabledListSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/user/UserEditSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/user/UserLocalePrefAction.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/user/UserPrefSetupAction.java | 2
java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListAction.java | 4 +
java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListSetupAction.java | 4 -
java/code/src/com/redhat/rhn/frontend/action/user/test/ChangeEmailSetupActionTest.java | 3 -
java/code/src/com/redhat/rhn/frontend/action/user/test/DisableSelfConfirmActionTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3 +
java/code/src/com/redhat/rhn/frontend/struts/BaseListAction.java | 2
java/code/src/com/redhat/rhn/frontend/struts/test/RhnListActionTest.java | 5 +-
java/code/src/com/redhat/rhn/frontend/struts/test/RhnUnpagedListActionTest.java | 4 +
java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateTest.java | 3 -
java/code/src/com/redhat/rhn/testing/ActionHelper.java | 2
java/code/src/com/redhat/rhn/testing/BaseDeleteErrataActionAbstractTest.java | 2
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 13 +++++
337 files changed, 907 insertions(+), 569 deletions(-)
New commits:
commit 039d53b034dba45fa546e25dc177828340c1f25e
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Tue Jun 5 15:25:50 2012 +0200
Refactor "pageList" to RequestContext.PAGE_LIST
Do not use literal when there is a final static available.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/BaseChannelTreeAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/BaseChannelTreeAction.java
index ac4e25e..1bd7308 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/BaseChannelTreeAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/BaseChannelTreeAction.java
@@ -61,7 +61,7 @@ public abstract class BaseChannelTreeAction extends RhnUnpagedListAction {
Collections.sort(dr);
dr = handleOrphans(dr);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("satAdmin", user.hasRole(RoleFactory.SAT_ADMIN));
addAttributes(requestContext);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelErrataAction.java
index 5db933d..6b9a8cb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelErrataAction.java
@@ -55,7 +55,7 @@ public class ChannelErrataAction extends RhnAction {
request.setAttribute("channel_name", chan.getName());
request.setAttribute("cid", chan.getId());
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- request.setAttribute("pageList", ErrataManager.errataInChannel(cid));
+ request.setAttribute(RequestContext.PAGE_LIST, ErrataManager.errataInChannel(cid));
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelFamilyTreeAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelFamilyTreeAction.java
index 3ad89ae..3083e09 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelFamilyTreeAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelFamilyTreeAction.java
@@ -58,7 +58,7 @@ public class ChannelFamilyTreeAction extends BaseChannelTreeAction {
Collections.sort(dr);
dr = handleOrphans(dr);
dr.setFilter(false);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("cfid", cfid);
request.setAttribute("familyName", co.getName());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelPackagesAction.java
index d0b5a4f..99f9009 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelPackagesAction.java
@@ -60,7 +60,8 @@ public class ChannelPackagesAction extends RhnAction {
request.setAttribute("channel_name", chan.getName());
request.setAttribute("cid", chan.getId());
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- request.setAttribute("pageList", PackageManager.listPackagesInChannelForList(cid));
+ request.setAttribute(RequestContext.PAGE_LIST,
+ PackageManager.listPackagesInChannelForList(cid));
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelSubscribedAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelSubscribedAction.java
index 5b88f89..189e377 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelSubscribedAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelSubscribedAction.java
@@ -85,7 +85,7 @@ public class ChannelSubscribedAction extends RhnAction {
request.setAttribute("cid", chan.getId());
request.setAttribute("channel_name", chan.getName());
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverviewAction.java
index 7b14d4d..acfddfe 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverviewAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverviewAction.java
@@ -77,7 +77,7 @@ public class PackageNameOverviewAction extends RhnAction {
user.getOrg(), pkgName, channelArches);
}
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java
index 74beb1a..37dc982 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java
@@ -275,11 +275,11 @@ public class PackageSearchAction extends RhnAction {
}
log.warn("GET search: " + results);
- request.setAttribute("pageList",
+ request.setAttribute(RequestContext.PAGE_LIST,
results != null ? results : Collections.EMPTY_LIST);
}
else {
- request.setAttribute("pageList", Collections.EMPTY_LIST);
+ request.setAttribute(RequestContext.PAGE_LIST, Collections.EMPTY_LIST);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java
index b49c9ed..ef5b479 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java
@@ -170,7 +170,7 @@ public class AddCustomErrataAction extends RhnListAction {
DataResult dr = getData(request, selectedChannel, currentChan, null,
checked, user);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
if (ListTagHelper.getListAction(LIST_NAME, request) != null) {
helper.execute(set, LIST_NAME, dr);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
index 5893b90..d36bd59 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
@@ -214,7 +214,7 @@ public class AddRedHatErrataAction extends RhnListAction {
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
if (ListTagHelper.getListAction("errata", request) != null) {
helper.execute(set, "errata", dr);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAction.java
index 0844da4..e96fe0f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAction.java
@@ -100,7 +100,7 @@ public class ChannelPackagesAction extends RhnAction {
request.setAttribute("cid", chan.getId());
request.setAttribute("channel_name", chan.getName());
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
String button = LocalizationService.getInstance().getMessage(
"channel.jsp.package.removebutton");
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java
index 5919596..4db3eb7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java
@@ -178,7 +178,7 @@ public class ChannelPackagesAddAction extends RhnAction {
request.setAttribute("channel_name", chan.getName());
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddConfirmAction.java
index c5c1b77..43408f2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddConfirmAction.java
@@ -85,7 +85,7 @@ public class ChannelPackagesAddConfirmAction extends RhnAction {
request.setAttribute("cid", chan.getId());
request.setAttribute("channel_name", chan.getName());
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
String button = LocalizationService.getInstance().getMessage(
"channel.jsp.package.addbutton");
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesRemoveAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesRemoveAction.java
index 89c1a99..767dc60 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesRemoveAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesRemoveAction.java
@@ -84,7 +84,7 @@ public class ChannelPackagesRemoveAction extends RhnAction {
request.setAttribute("cid", chan.getId());
request.setAttribute("channel_name", chan.getName());
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
String button = LocalizationService.getInstance().getMessage(
"channel.jsp.package.confirmbutton");
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index 24af8f7..7f3b54e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -669,7 +669,7 @@ public class EditChannelAction extends RhnAction implements Listable {
/** {@inheritDoc} */
public String getDataSetName() {
- return "pageList";
+ return RequestContext.PAGE_LIST;
}
/** {@inheritDoc} */
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PatchSetListAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PatchSetListAction.java
index dfe7f0d..fb023ed 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PatchSetListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PatchSetListAction.java
@@ -126,7 +126,7 @@ public class PatchSetListAction extends RhnListAction {
request.setAttribute("cid", chan.getId());
- request.setAttribute("pageList", patchSets);
+ request.setAttribute(RequestContext.PAGE_LIST, patchSets);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
ListTagHelper.bindSetDeclTo(LIST_NAME, getDecl(), request);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoListSetupAction.java
index 7db5712..1ae1e2f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoListSetupAction.java
@@ -54,7 +54,7 @@ public class RepoListSetupAction extends RhnAction {
result = RepoLister.getInstance().list(user);
Collections.sort(result, LABEL_COMPARATOR);
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/SelectChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/SelectChannelAction.java
index 97cc701..34d20fe 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/SelectChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/SelectChannelAction.java
@@ -39,8 +39,6 @@ import javax.servlet.http.HttpServletResponse;
*/
public class SelectChannelAction extends RhnListAction implements Listable {
- private static final String DATA_SET = "pageList";
-
/** {@inheritDoc} */
public ActionForward execute(ActionMapping actionMapping,
ActionForm actionForm,
@@ -49,7 +47,7 @@ public class SelectChannelAction extends RhnListAction implements Listable {
throws Exception {
ListHelper helper = new ListHelper(this, request);
- helper.setDataSetName(DATA_SET);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.execute();
return actionMapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/test/AllChannelTreeActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/channel/test/AllChannelTreeActionTest.java
index a8d541e..34c4f06 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/test/AllChannelTreeActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/test/AllChannelTreeActionTest.java
@@ -51,7 +51,8 @@ public class AllChannelTreeActionTest extends RhnBaseTestCase {
OrgFactory.save(user.getOrg());
sah.executeAction();
- DataResult dr = (DataResult) sah.getRequest().getAttribute("pageList");
+ DataResult dr = (DataResult) sah.getRequest().getAttribute(
+ RequestContext.PAGE_LIST);
assertNotEmpty(dr);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/test/RetiredChannelTreeActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/channel/test/RetiredChannelTreeActionTest.java
index 6fcea4c..c763497 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/test/RetiredChannelTreeActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/test/RetiredChannelTreeActionTest.java
@@ -53,7 +53,8 @@ public class RetiredChannelTreeActionTest extends RhnBaseTestCase {
OrgFactory.save(user.getOrg());
sah.executeAction();
- DataResult dr = (DataResult) sah.getRequest().getAttribute("pageList");
+ DataResult dr = (DataResult) sah.getRequest().getAttribute(
+ RequestContext.PAGE_LIST);
assertNotEmpty(dr);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/BaseCopyToAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/BaseCopyToAction.java
index 0d4b8a3..06498d5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/BaseCopyToAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/BaseCopyToAction.java
@@ -91,7 +91,7 @@ public abstract class BaseCopyToAction extends RhnAction {
helper.execute(getSetDecl().get(user), getJspLabel(), result);
}
- req.setAttribute("pageList", result);
+ req.setAttribute(RequestContext.PAGE_LIST, result);
RhnSet destSet = getSetDecl().lookup(user);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/GlobalConfigChannelList.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/GlobalConfigChannelList.java
index 9d69efa..fe5ba93 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/GlobalConfigChannelList.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/GlobalConfigChannelList.java
@@ -52,7 +52,7 @@ public class GlobalConfigChannelList extends RhnListAction {
pc.setFilter(true);
clampListBounds(pc, request, user);
- request.setAttribute("pageList", getDataResult(user, pc));
+ request.setAttribute(RequestContext.PAGE_LIST, getDataResult(user, pc));
return getStrutsDelegate().forwardParams(mapping.findForward(
RhnHelper.DEFAULT_FORWARD), request.getParameterMap());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/ManagedSystemsList.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/ManagedSystemsList.java
index 0d594aa..f90236c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/ManagedSystemsList.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/ManagedSystemsList.java
@@ -51,7 +51,7 @@ public class ManagedSystemsList extends RhnListAction {
pc.setFilter(true);
clampListBounds(pc, request, user);
- request.setAttribute("pageList", getDataResult(user, pc));
+ request.setAttribute(RequestContext.PAGE_LIST, getDataResult(user, pc));
return getStrutsDelegate().forwardParams(mapping.findForward(
RhnHelper.DEFAULT_FORWARD), request.getParameterMap());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesListSetupTest.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesListSetupTest.java
index 2720071..65eaeee 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesListSetupTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelFilesListSetupTest.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.configuration.test;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.config.ConfigChannel;
import com.redhat.rhn.domain.role.RoleFactory;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.testing.ConfigTestUtils;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
import com.redhat.rhn.testing.UserTestUtils;
@@ -32,8 +33,8 @@ public class ChannelFilesListSetupTest extends RhnMockStrutsTestCase {
setRequestPathInfo("/configuration/ChannelFiles");
addRequestParameter("ccid", "" + ccid);
actionPerform();
- assertNotNull(request.getAttribute("pageList"));
- DataResult dr = (DataResult)request.getAttribute("pageList");
+ assertNotNull(request.getAttribute(RequestContext.PAGE_LIST));
+ DataResult dr = (DataResult)request.getAttribute(RequestContext.PAGE_LIST);
assertEquals(0, dr.getTotalSize());
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelSystemsListSetupTest.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelSystemsListSetupTest.java
index d82777f..5e02760 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelSystemsListSetupTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ChannelSystemsListSetupTest.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.configuration.test;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.config.ConfigChannel;
import com.redhat.rhn.domain.role.RoleFactory;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.testing.ConfigTestUtils;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
import com.redhat.rhn.testing.UserTestUtils;
@@ -32,8 +33,8 @@ public class ChannelSystemsListSetupTest extends RhnMockStrutsTestCase {
setRequestPathInfo("/configuration/channel/ChannelSystems");
addRequestParameter("ccid", "" + ccid);
actionPerform();
- assertNotNull(request.getAttribute("pageList"));
- DataResult dr = (DataResult)request.getAttribute("pageList");
+ assertNotNull(request.getAttribute(RequestContext.PAGE_LIST));
+ DataResult dr = (DataResult)request.getAttribute(RequestContext.PAGE_LIST);
assertEquals(0, dr.getTotalSize());
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/GlobalConfigChannelListTest.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/GlobalConfigChannelListTest.java
index 303fd76..c31e5f3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/GlobalConfigChannelListTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/GlobalConfigChannelListTest.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.config.ConfigChannel;
import com.redhat.rhn.domain.config.ConfigurationFactory;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.frontend.dto.ConfigChannelDto;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.testing.ConfigTestUtils;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
import com.redhat.rhn.testing.UserTestUtils;
@@ -36,7 +37,7 @@ public class GlobalConfigChannelListTest extends RhnMockStrutsTestCase {
setRequestPathInfo("/configuration/GlobalConfigChannelList");
actionPerform();
- verifyList("pageList", ConfigChannelDto.class);
+ verifyList(RequestContext.PAGE_LIST, ConfigChannelDto.class);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/GlobalConfigFileListTest.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/GlobalConfigFileListTest.java
index 9d6ccca..7e2aad3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/GlobalConfigFileListTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/GlobalConfigFileListTest.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.config.ConfigFile;
import com.redhat.rhn.domain.config.ConfigurationFactory;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.frontend.dto.ConfigFileDto;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.testing.ConfigTestUtils;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
import com.redhat.rhn.testing.UserTestUtils;
@@ -39,7 +40,7 @@ public class GlobalConfigFileListTest extends RhnMockStrutsTestCase {
setRequestPathInfo("/configuration/file/GlobalConfigFileList");
actionPerform();
- verifyList("pageList", ConfigFileDto.class);
+ verifyList(RequestContext.PAGE_LIST, ConfigFileDto.class);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/LocalConfigFileListTest.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/LocalConfigFileListTest.java
index 97234e5..bc2dae8 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/LocalConfigFileListTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/LocalConfigFileListTest.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.action.configuration.test;
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.UserTestUtils;
@@ -30,7 +31,7 @@ public class LocalConfigFileListTest extends RhnMockStrutsTestCase {
setRequestPathInfo("/configuration/file/LocalConfigFileList");
actionPerform();
- assertNotNull(request.getAttribute("pageList"));
+ assertNotNull(request.getAttribute(RequestContext.PAGE_LIST));
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ManageRevisionActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ManageRevisionActionTest.java
index 92c6cde..1ba5fc3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ManageRevisionActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ManageRevisionActionTest.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.configuration.test;
import com.redhat.rhn.domain.config.ConfigRevision;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.frontend.dto.ConfigRevisionDto;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.testing.ConfigTestUtils;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
import com.redhat.rhn.testing.UserTestUtils;
@@ -37,7 +38,7 @@ public class ManageRevisionActionTest extends RhnMockStrutsTestCase {
addRequestParameter("cfid", revision.getConfigFile().getId().toString());
actionPerform();
assertNotNull(request.getParameter("cfid"));
- verifyList("pageList", ConfigRevisionDto.class);
+ verifyList(RequestContext.PAGE_LIST, ConfigRevisionDto.class);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ManagedSystemsListTest.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ManagedSystemsListTest.java
index 5a3bd37..5c53a42 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ManagedSystemsListTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/test/ManagedSystemsListTest.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.config.ConfigurationFactory;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.frontend.dto.ConfigSystemDto;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.testing.ConfigTestUtils;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
import com.redhat.rhn.testing.UserTestUtils;
@@ -44,13 +45,13 @@ public class ManagedSystemsListTest extends RhnMockStrutsTestCase {
setRequestPathInfo("/configuration/system/ManagedSystems");
actionPerform();
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertTrue("Your list: pageList is NOT Empty", dr.isEmpty());
ConfigTestUtils.giveConfigCapabilities(serv);
actionPerform();
- verifyList("pageList", ConfigSystemDto.class);
+ verifyList(RequestContext.PAGE_LIST, ConfigSystemDto.class);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/AddPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/AddPackagesAction.java
index 476d042..664e535 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/AddPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/AddPackagesAction.java
@@ -51,8 +51,6 @@ import javax.servlet.http.HttpServletResponse;
/** @version $Revision$ */
public class AddPackagesAction extends RhnAction implements Listable {
- private static final String DATA_SET = "pageList";
-
/** {@inheritDoc} */
public ActionForward execute(ActionMapping actionMapping,
ActionForm actionForm,
@@ -76,7 +74,7 @@ public class AddPackagesAction extends RhnAction implements Listable {
RhnSetManager.store(set);
}
ListRhnSetHelper helper = new ListRhnSetHelper(this, request, decl);
- helper.setDataSetName(DATA_SET);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
// If it's a view change, don't throw a message saying there was nothing selected
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/AddPackagesConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/AddPackagesConfirmAction.java
index ce95c7d..fac380c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/AddPackagesConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/AddPackagesConfirmAction.java
@@ -51,8 +51,6 @@ import javax.servlet.http.HttpServletResponse;
/** @version $Revision$ */
public class AddPackagesConfirmAction extends RhnAction implements Listable {
- private static final String DATA_SET = "pageList";
-
/** {@inheritDoc} */
public ActionForward execute(ActionMapping actionMapping,
ActionForm actionForm,
@@ -70,7 +68,7 @@ public class AddPackagesConfirmAction extends RhnAction implements Listable {
context.getRequiredParam("eid"));
ListRhnSetHelper helper = new ListRhnSetHelper(this, request, decl);
- helper.setDataSetName(DATA_SET);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.setWillClearSet(false);
helper.execute();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsSetupAction.java
index 7038250..b6ed2fd 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsSetupAction.java
@@ -93,7 +93,7 @@ public class AffectedSystemsSetupAction extends RhnListAction {
TagHelper.bindElaboratorTo("systemAffectedList", dr.getElaborator(), request);
ListTagHelper.bindSetDeclTo(LIST_NAME, RhnSetDecl.SYSTEMS_AFFECTED, request);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("set", set);
request.setAttribute("errata", errata);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI() + "?" +
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/BaseErrataListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/BaseErrataListSetupAction.java
index bf90c6c..37980d4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/BaseErrataListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/BaseErrataListSetupAction.java
@@ -48,7 +48,7 @@ public abstract class BaseErrataListSetupAction extends RhnListAction {
DataResult dr = getDataResult(user, pc);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ChannelSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ChannelSetupAction.java
index 8f26a84..b08f3e0 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ChannelSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ChannelSetupAction.java
@@ -146,7 +146,7 @@ public class ChannelSetupAction extends RhnListAction {
}
}
- request.setAttribute("pageList", channels);
+ request.setAttribute(RequestContext.PAGE_LIST, channels);
request.setAttribute("set", set);
//set advisory for toolbar
request.setAttribute("advisory", e.getAdvisory());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmSetupAction.java
index d765c05..dfea24c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmSetupAction.java
@@ -60,7 +60,7 @@ public class ErrataConfirmSetupAction extends RhnListAction {
(DynaActionForm)formIn, "date", DatePicker.YEAR_RANGE_POSITIVE);
request.setAttribute("date", picker);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("errata", errata);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
index ed7ddbb..bb8fbaa 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
@@ -219,7 +219,7 @@ public class ErrataSearchAction extends RhnAction {
search, viewmode, form);
log.warn("GET search: " + results);
- request.setAttribute("pageList",
+ request.setAttribute(RequestContext.PAGE_LIST,
results != null ? results : Collections.EMPTY_LIST);
}
else {
@@ -230,7 +230,7 @@ public class ErrataSearchAction extends RhnAction {
log.debug("Issue Start Date = " + dates.getStart().getDate());
log.debug("End Start Date = " + dates.getEnd().getDate());
}
- request.setAttribute("pageList", Collections.EMPTY_LIST);
+ request.setAttribute(RequestContext.PAGE_LIST, Collections.EMPTY_LIST);
Map paramMap = request.getParameterMap();
if (!paramMap.containsKey("optionIssueDateSearch")) {
form.set("optionIssueDateSearch", Boolean.FALSE);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ListPackagesSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ListPackagesSetupAction.java
index 04bc509..c2dd7f0 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ListPackagesSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ListPackagesSetupAction.java
@@ -64,7 +64,7 @@ public class ListPackagesSetupAction extends BaseErrataSetupAction {
DataResult dr = PackageManager.packagesInErrata(errata, pc);
RhnSet set = RhnSetDecl.PACKAGES_TO_REMOVE.get(user);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("set", set);
if (!requestContext.isSubmitted()) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java
index fc8bc96..dd3ab24 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java
@@ -104,7 +104,7 @@ public class PackagePushSetupAction extends RhnListAction {
Channel c = ChannelManager.lookupByIdAndUser(cid, user);
if (!dr.isEmpty()) {
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("cid", cid);
request.setAttribute("set", packageSet);
request.setAttribute("advisory", e.getAdvisory());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/RemovePackagesSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/RemovePackagesSetupAction.java
index 80e3f1b..53fa4ec 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/RemovePackagesSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/RemovePackagesSetupAction.java
@@ -52,7 +52,7 @@ public class RemovePackagesSetupAction extends BaseErrataSetupAction {
DataResult dr = PackageManager.packageIdsInSet(user, "packages_to_remove", pc);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
return super.execute(mapping, formIn, request, response);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/AffectedSystemsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/AffectedSystemsSetupActionTest.java
index 73d5b53..df652a0 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/AffectedSystemsSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/AffectedSystemsSetupActionTest.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.domain.errata.test.ErrataFactoryTest;
import com.redhat.rhn.frontend.dto.SystemOverview;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
import java.util.Iterator;
@@ -48,7 +49,7 @@ public class AffectedSystemsSetupActionTest extends RhnMockStrutsTestCase {
Errata e = ErrataFactoryTest.createTestErrata(user.getOrg().getId());
addRequestParameter("eid", e.getId().toString());
actionPerform();
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
Iterator itr = dr.iterator();
while (itr.hasNext()) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/BaseErrataConfirmSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/BaseErrataConfirmSetupActionTest.java
index 26a3e5e..18b05ed 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/BaseErrataConfirmSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/BaseErrataConfirmSetupActionTest.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.errata.test;
import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.domain.errata.test.ErrataFactoryTest;
import com.redhat.rhn.frontend.action.errata.RemovePackagesSetupAction;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -47,6 +48,6 @@ public class BaseErrataConfirmSetupActionTest extends RhnBaseTestCase {
sah.getRequest().setupAddParameter("eid", e.getId().toString());
sah.executeAction();
- assertNotNull(sah.getRequest().getAttribute("pageList"));
+ assertNotNull(sah.getRequest().getAttribute(RequestContext.PAGE_LIST));
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelSetupActionTest.java
index 3457b79..d9b66f1 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelSetupActionTest.java
@@ -82,7 +82,8 @@ public class ChannelSetupActionTest extends RhnBaseTestCase {
assertEquals(result.getName(), RhnHelper.DEFAULT_FORWARD);
//get the data result back out of the request and inspect
- DataResult dr = (DataResult) sah.getRequest().getAttribute("pageList");
+ DataResult dr = (DataResult) sah.getRequest().getAttribute(
+ RequestContext.PAGE_LIST);
assertNotNull(dr);
Iterator itr = dr.iterator();
while (itr.hasNext()) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmSetupActionTest.java
index 4c1fa58..1342840 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneConfirmSetupActionTest.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.rhnset.RhnSetFactory;
import com.redhat.rhn.domain.rhnset.SetCleanup;
import com.redhat.rhn.domain.role.RoleFactory;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
@@ -62,7 +63,7 @@ public class CloneConfirmSetupActionTest extends RhnMockStrutsTestCase {
actionPerform();
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertTrue(dr.size() == 5);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ListPackagesSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ListPackagesSetupActionTest.java
index d790f28..ee74864 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ListPackagesSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ListPackagesSetupActionTest.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.errata.test;
import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.domain.errata.test.ErrataFactoryTest;
import com.redhat.rhn.frontend.action.errata.ListPackagesSetupAction;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -44,6 +45,6 @@ public class ListPackagesSetupActionTest extends RhnBaseTestCase {
sah.executeAction();
//make sure we got something for page list
- assertNotNull(sah.getRequest().getAttribute("pageList"));
+ assertNotNull(sah.getRequest().getAttribute(RequestContext.PAGE_LIST));
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/PublishedDeleteConfirmSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/PublishedDeleteConfirmSetupActionTest.java
index 9f6abe8..e970c6b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/PublishedDeleteConfirmSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/PublishedDeleteConfirmSetupActionTest.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.rhnset.RhnSetFactory;
import com.redhat.rhn.domain.rhnset.SetCleanup;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.frontend.dto.OwnedErrata;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
@@ -73,7 +74,7 @@ public class PublishedDeleteConfirmSetupActionTest extends RhnMockStrutsTestCase
actionPerform();
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertEquals(10, dr.size());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/UnpublishedDeleteConfirmSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/UnpublishedDeleteConfirmSetupActionTest.java
index 914421e..bb0586c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/UnpublishedDeleteConfirmSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/UnpublishedDeleteConfirmSetupActionTest.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.rhnset.RhnSetFactory;
import com.redhat.rhn.domain.rhnset.SetCleanup;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.frontend.dto.OwnedErrata;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
@@ -73,7 +74,7 @@ public class UnpublishedDeleteConfirmSetupActionTest extends RhnMockStrutsTestCa
actionPerform();
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertEquals(5, dr.size());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/BaseListAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/BaseListAction.java
index 8cc85a6..1a9493d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/groups/BaseListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/groups/BaseListAction.java
@@ -45,7 +45,7 @@ public abstract class BaseListAction extends RhnAction implements Listable {
/** {@inheritDoc} */
public String getDataSetName() {
- return "pageList";
+ return RequestContext.PAGE_LIST;
}
/** {@inheritDoc} */
diff --git a/java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java
index ec5e6b6..c497799 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java
@@ -173,11 +173,11 @@ public class DocSearchSetupAction extends RhnAction {
searchString,
viewmode, request);
log.debug("GET search: " + results);
- request.setAttribute("pageList",
+ request.setAttribute(RequestContext.PAGE_LIST,
results != null ? results : Collections.EMPTY_LIST);
}
else {
- request.setAttribute("pageList", Collections.EMPTY_LIST);
+ request.setAttribute(RequestContext.PAGE_LIST, Collections.EMPTY_LIST);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/keys/CryptoKeysListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/keys/CryptoKeysListSetupAction.java
index b69a6cc..f87e798 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/keys/CryptoKeysListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/keys/CryptoKeysListSetupAction.java
@@ -44,7 +44,7 @@ public class CryptoKeysListSetupAction extends RhnAction {
DataResult result = KickstartLister.getInstance().cryptoKeysInOrg(
requestContext.getCurrentUser().getOrg(), null);
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeSetupAction.java
index 6fb4bb5..c3d836a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeSetupAction.java
@@ -70,7 +70,7 @@ public class KickstartIpRangeSetupAction extends RhnAction {
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- request.setAttribute("pageList", getDataResult(requestContext, null));
+ request.setAttribute(RequestContext.PAGE_LIST, getDataResult(requestContext, null));
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartsSetupAction.java
index a62e20d..a10ec68 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartsSetupAction.java
@@ -64,7 +64,7 @@ public class KickstartsSetupAction extends RhnAction {
listCobblerProfiles(user);
result.addAll(dtos);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
TagHelper.bindElaboratorTo("ksList", result.getElaborator(), request);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/cobbler/CobblerSnippetListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/cobbler/CobblerSnippetListSetupAction.java
index 7809122..a16c086 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/cobbler/CobblerSnippetListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/cobbler/CobblerSnippetListSetupAction.java
@@ -68,7 +68,7 @@ public class CobblerSnippetListSetupAction extends RhnAction {
mapping.getParameter() + "]");
}
Collections.sort(result, NAME_COMPARATOR);
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpSetupActionTest.java
index 7322f15..866fbcb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartIpSetupActionTest.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartIpRange;
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.TestUtils;
import com.redhat.rhn.testing.UserTestUtils;
@@ -62,7 +63,7 @@ public class KickstartIpSetupActionTest extends RhnMockStrutsTestCase {
setRequestPathInfo("/kickstart/KickstartIpRanges");
actionPerform();
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertTrue(dr.size() >= 2);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartsSetupActionTest.java
index 61e2dd7..fe67124 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartsSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartsSetupActionTest.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.db.datasource.DataResult;
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.UserTestUtils;
@@ -36,7 +37,7 @@ public class KickstartsSetupActionTest extends RhnMockStrutsTestCase {
KickstartData k = KickstartDataTest.createKickstartWithChannel(user.getOrg());
setRequestPathInfo("/kickstart/Kickstarts");
actionPerform();
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertTrue(dr.size() >= 1);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java
index b707c9c..1c11563 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScriptSetupActionTest.java
@@ -35,7 +35,7 @@ public class ScriptSetupActionTest extends RhnMockStrutsTestCase {
setRequestPathInfo("/kickstart/Scripts");
addRequestParameter(RequestContext.KICKSTART_ID, k.getId().toString());
actionPerform();
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertTrue(dr.size() > 0);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterListSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterListSetupActionTest.java
index d356e26..ee40d49 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterListSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterListSetupActionTest.java
@@ -86,7 +86,7 @@ public class FilterListSetupActionTest extends RhnBaseTestCase {
user = requestContext.getLoggedInUser();
RhnSet set = (RhnSet) request.getAttribute("set");
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertTrue(dr.size() > 0);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodsSetupActionTest.java
index a7908d7..611f195 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodsSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/MethodsSetupActionTest.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.monitoring.notification.test;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.frontend.action.monitoring.notification.MethodsSetupAction;
import com.redhat.rhn.frontend.dto.monitoring.MethodDto;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
import com.redhat.rhn.testing.RhnMockHttpServletRequest;
@@ -40,7 +41,7 @@ public class MethodsSetupActionTest extends RhnBaseTestCase {
// Remove if not a List SetupAction
RhnMockHttpServletRequest request = sah.getRequest();
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertTrue(dr.size() > 0);
assertTrue(dr.iterator().next() instanceof MethodDto);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsEditActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsEditActionTest.java
index 9741c5a..87006f4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsEditActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsEditActionTest.java
@@ -124,9 +124,10 @@ public class ProbeSuiteSystemsEditActionTest extends RhnBaseTestCase {
sah.executeAction();
assertNotNull(sah.getRequest().getAttribute("probeSuite"));
- assertNotNull(sah.getRequest().getAttribute("pageList"));
+ assertNotNull(sah.getRequest().getAttribute(RequestContext.PAGE_LIST));
assertNotNull(sah.getRequest().getAttribute("satClusters"));
- DataResult dr = (DataResult) sah.getRequest().getAttribute("pageList");
+ DataResult dr = (DataResult) sah.getRequest().getAttribute(
+ RequestContext.PAGE_LIST);
assertTrue(dr.size() > 0);
for (int i = 0; i < dr.size(); i++) {
SystemOverview so = (SystemOverview) dr.get(i);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsSetupActionTest.java
index ddc38f3..0b58a14 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsSetupActionTest.java
@@ -72,7 +72,7 @@ public class ProbeSuiteSystemsSetupActionTest extends RhnBaseTestCase {
user = requestContext.getLoggedInUser();
RhnSet set = (RhnSet) request.getAttribute("set");
- List dr = (List) request.getAttribute("pageList");
+ List dr = (List) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertTrue(dr.size() > 0);
assertTrue(dr.get(0) instanceof MonitoredServerDto);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuitesRemoveSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuitesRemoveSetupActionTest.java
index 00772de..5e8ec2b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuitesRemoveSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuitesRemoveSetupActionTest.java
@@ -67,7 +67,7 @@ public class ProbeSuitesRemoveSetupActionTest extends RhnBaseTestCase {
user = requestContext.getLoggedInUser();
set = (RhnSet) request.getAttribute("set");
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertTrue(dr.size() > 0);
assertNotNull(set);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatUserListAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatUserListAction.java
index c19c9c6..4f488d3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatUserListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatUserListAction.java
@@ -62,7 +62,7 @@ public class SatUserListAction extends RhnAction {
request.setAttribute("canModify", canModify);
request.setAttribute("userOrgId", oid);
request.setAttribute("orgName", name);
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementDetailsAction.java
index d18edb2..3fc54ce 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementDetailsAction.java
@@ -56,7 +56,7 @@ public class SoftwareEntitlementDetailsAction extends RhnAction {
channelFamily.getChannels());
request.setAttribute("entitlementName", channelFamily.getName());
- request.setAttribute("pageList", channelsPageList);
+ request.setAttribute(RequestContext.PAGE_LIST, channelsPageList);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java
index 9463df7..a359083 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java
@@ -100,7 +100,7 @@ public class SystemEntitlementOrgsAction extends RhnAction {
request.setAttribute("egntname", entitlementLabel);
request.setAttribute("enthuman", e.getHumanReadableLabel());
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI() +
"?label=" + entitlementLabel);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementsAction.java
index 78b2d30..88406fa 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementsAction.java
@@ -51,7 +51,7 @@ public class SystemEntitlementsAction extends RhnAction {
Long orgCount = OrgManager.getTotalOrgCount(u);
request.setAttribute("orgCount", orgCount);
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java
index c9b5d42..f9482fa 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java
@@ -114,7 +114,7 @@ abstract class FormDispatcher extends RhnAction {
public class TrustAction extends FormDispatcher {
private static final String LIST_NAME = "trustedOrgs";
- private static final String DATA_SET = "pageList";
+ private static final String DATA_SET = RequestContext.PAGE_LIST;
private static final RhnSetDecl RHNSET = RhnSetDecl.MULTIORG_TRUST_LIST;
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/UserListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/UserListSetupAction.java
index 676b274..3eb1e22 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/UserListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/UserListSetupAction.java
@@ -60,7 +60,7 @@ public class UserListSetupAction extends RhnAction {
request.setAttribute("canModify", canModify);
request.setAttribute("orgName", name);
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
request.setAttribute(ListTagHelper.PARENT_URL,
request.getRequestURI() + "?oid=" + oid);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java
index 99e79a5..241122c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java
@@ -55,7 +55,7 @@ import javax.servlet.http.HttpServletResponse;
* @version $Rev$
*/
public abstract class BaseSystemPackagesConfirmAction extends RhnAction {
- private static final String DATA_SET = "pageList";
+ private static final String DATA_SET = RequestContext.PAGE_LIST;
private static final String ENABLE_REMOTE_COMMAND =
"enableRemoteCommand";
private static final String WIDGET_SUMMARY = "widgetSummary";
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackageListAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackageListAction.java
index 11dae6d..f2ced25 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackageListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackageListAction.java
@@ -165,7 +165,7 @@ public class CustomPackageListAction extends RhnAction {
request.setAttribute("channel_list", chanList);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackagesDeleteConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackagesDeleteConfirmAction.java
index 393906e..ab6af51 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackagesDeleteConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackagesDeleteConfirmAction.java
@@ -69,7 +69,7 @@ public class CustomPackagesDeleteConfirmAction extends RhnAction {
TagHelper.bindElaboratorTo(LIST_NAME, result.getElaborator(), request);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
String button = LocalizationService.getInstance().getMessage(
"channel.jsp.manage.package.delete");
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/SolarisPatchSetListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/SolarisPatchSetListSetupAction.java
index bcec512..5ea64ed 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/SolarisPatchSetListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/SolarisPatchSetListSetupAction.java
@@ -60,7 +60,7 @@ public class SolarisPatchSetListSetupAction extends RhnListAction {
// need security
Server server = SystemManager.lookupByIdAndUser(sid, user);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("system", server);
return getStrutsDelegate().forwardParams(
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallSetupAction.java
index 775418c..ab7dcaa 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallSetupAction.java
@@ -79,7 +79,7 @@ public class PatchConfirmInstallSetupAction extends RhnListAction {
Date expectedCheckIn = new Date(server.getLastCheckin().getTime() +
(1000 * 60 * 60 * 2));
request.setAttribute("expectedcheckin", expectedCheckIn);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("sid", sid);
request.setAttribute("pageSummary", msg);
request.setAttribute("system", server);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmSetupAction.java
index acfa25e..f377f65 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmSetupAction.java
@@ -80,7 +80,7 @@ public class PatchConfirmSetupAction extends RhnListAction {
Date expectedCheckIn = new Date(server.getLastCheckin().getTime() +
(1000 * 60 * 60 * 2));
request.setAttribute("expectedcheckin", expectedCheckIn);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("sid", sid);
request.setAttribute("pageSummary", msg);
request.setAttribute("system", server);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchInstallSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchInstallSetupAction.java
index cf8f597..f6b7ccf 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchInstallSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchInstallSetupAction.java
@@ -62,7 +62,7 @@ public class PatchInstallSetupAction extends RhnListAction {
Server server = SystemManager.lookupByIdAndUser(sid, user);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("set", set);
request.setAttribute("system", server);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchListSetupAction.java
index 0873e0e..a8f7427 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchListSetupAction.java
@@ -62,7 +62,7 @@ public class PatchListSetupAction extends RhnListAction {
Server server = SystemManager.lookupByIdAndUser(sid, user);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("set", set);
request.setAttribute("system", server);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/test/PatchListSetupTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/test/PatchListSetupTest.java
index 2a59847..b164e85 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/test/PatchListSetupTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/test/PatchListSetupTest.java
@@ -62,7 +62,7 @@ public class PatchListSetupTest extends RhnBaseTestCase {
User user = requestContext.getLoggedInUser();
RhnSet set = (RhnSet) request.getAttribute("set");
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertTrue(dr.size() > 0);
assertNotNull(set);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java
index ac6a4c6..11794ce 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java
@@ -43,7 +43,6 @@ import javax.servlet.http.HttpServletResponse;
public class CompareProfileSetupAction extends RhnAction {
private static final String LIST_NAME = "compareList";
- public static final String DATA_SET = "pageList";
/** {@inheritDoc} */
public ActionForward execute(ActionMapping mapping,
@@ -102,7 +101,7 @@ public class CompareProfileSetupAction extends RhnAction {
request.setAttribute(ListTagHelper.PARENT_URL,
request.getRequestURI() + "?sid=" + sid + "&prid=" + prid);
- request.setAttribute(DATA_SET, dataSet);
+ request.setAttribute(RequestContext.PAGE_LIST, dataSet);
ListTagHelper.bindSetDeclTo(LIST_NAME, getDecl(sid), request);
TagHelper.bindElaboratorTo(LIST_NAME, dataSet.getElaborator(), request);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java
index 732ad47..3db0485 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java
@@ -44,7 +44,6 @@ import javax.servlet.http.HttpServletResponse;
public class CompareSystemSetupAction extends RhnAction {
private static final String LIST_NAME = "compareList";
- public static final String DATA_SET = "pageList";
/** {@inheritDoc} */
public ActionForward execute(ActionMapping mapping,
@@ -96,7 +95,7 @@ public class CompareSystemSetupAction extends RhnAction {
request.setAttribute(ListTagHelper.PARENT_URL,
request.getRequestURI() + "?sid=" + sid + "&sid_1=" + sid1);
- request.setAttribute(DATA_SET, dataSet);
+ request.setAttribute(RequestContext.PAGE_LIST, dataSet);
ListTagHelper.bindSetDeclTo(LIST_NAME, getDecl(sid), request);
TagHelper.bindElaboratorTo(LIST_NAME, dataSet.getElaborator(), request);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/PackageListAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/PackageListAction.java
index 680d30a..33c1c20 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/PackageListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/PackageListAction.java
@@ -41,8 +41,6 @@ import javax.servlet.http.HttpServletResponse;
*/
public class PackageListAction extends RhnAction implements Listable {
- private static final String DATA_SET = "pageList";
-
/** {@inheritDoc} */
public ActionForward execute(ActionMapping actionMapping,
ActionForm actionForm,
@@ -64,7 +62,7 @@ public class PackageListAction extends RhnAction implements Listable {
Map params = new HashMap();
params.put(RequestContext.PRID, context.getRequiredParam(RequestContext.PRID));
ListHelper helper = new ListHelper(this, request, params);
- helper.setDataSetName(DATA_SET);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.execute();
Map forwardParams = new HashMap();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ProfilesListAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ProfilesListAction.java
index f76b0d1..5fe9502 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ProfilesListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ProfilesListAction.java
@@ -39,8 +39,6 @@ import javax.servlet.http.HttpServletResponse;
*/
public class ProfilesListAction extends RhnListAction implements Listable {
- private static final String DATA_SET = "pageList";
-
/** {@inheritDoc} */
public ActionForward execute(ActionMapping actionMapping,
ActionForm actionForm,
@@ -49,7 +47,7 @@ public class ProfilesListAction extends RhnListAction implements Listable {
throws Exception {
ListHelper helper = new ListHelper(this, request);
- helper.setDataSetName(DATA_SET);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.execute();
return actionMapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageInstallationAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageInstallationAction.java
index 1db29b4..ba436e9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageInstallationAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageInstallationAction.java
@@ -47,8 +47,6 @@ import com.redhat.rhn.manager.system.SystemManager;
*/
public class SchedulePackageInstallationAction extends RhnListAction implements Listable {
- private static final String DATA_SET = "pageList";
-
/** {@inheritDoc} */
public ActionForward execute(ActionMapping actionMapping,
ActionForm actionForm,
@@ -58,7 +56,7 @@ public class SchedulePackageInstallationAction extends RhnListAction implements
RequestContext requestContext = new RequestContext(request);
ListHelper helper = new ListHelper(this, request);
- helper.setDataSetName(DATA_SET);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.execute();
if (request.getParameter("dispatch") != null) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
index 2f9d36e..f1ae199 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
@@ -58,7 +58,6 @@ import javax.servlet.http.HttpServletResponse;
*/
public class SchedulePackageRemoveAction extends RhnListAction implements Listable {
- private static final String DATA_SET = "pageList";
private static Logger log = Logger.getLogger(SchedulePackageRemoveAction.class);
/** {@inheritDoc} */
@@ -70,7 +69,7 @@ public class SchedulePackageRemoveAction extends RhnListAction implements Listab
RequestContext requestContext = new RequestContext(request);
ListHelper helper = new ListHelper(this, request);
- helper.setDataSetName(DATA_SET);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.execute();
if (request.getParameter("dispatch") != null) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java
index 9611a6a..0278b45 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java
@@ -60,7 +60,6 @@ import javax.servlet.http.HttpServletResponse;
*/
public class SchedulePackageUpgradeAction extends RhnAction implements Listable {
- private static final String DATA_SET = "pageList";
private static Logger log = Logger.getLogger(SchedulePackageUpgradeAction.class);
/** {@inheritDoc} */
@@ -72,7 +71,7 @@ public class SchedulePackageUpgradeAction extends RhnAction implements Listable
RequestContext requestContext = new RequestContext(request);
ListHelper helper = new ListHelper(this, request);
- helper.setDataSetName(DATA_SET);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.execute();
if (request.getParameter("dispatch") != null) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageVerifyAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageVerifyAction.java
index 3c01373..a0b5477 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageVerifyAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageVerifyAction.java
@@ -25,6 +25,7 @@ import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.action.DynaActionForm;
+
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.common.messaging.MessageQueue;
@@ -52,8 +53,6 @@ import com.redhat.rhn.manager.system.SystemManager;
*/
public class SchedulePackageVerifyAction extends RhnAction implements Listable {
- private static final String DATA_SET = "pageList";
-
/** {@inheritDoc} */
public ActionForward execute(ActionMapping actionMapping,
ActionForm actionForm,
@@ -63,7 +62,7 @@ public class SchedulePackageVerifyAction extends RhnAction implements Listable {
RequestContext requestContext = new RequestContext(request);
ListHelper helper = new ListHelper(this, request);
- helper.setDataSetName(DATA_SET);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.execute();
if (request.getParameter("dispatch") != null) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java
index 32aa9a8..48f5b61 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java
@@ -41,8 +41,6 @@ import javax.servlet.http.HttpServletResponse;
*/
public class SelectInstallationPackagesAction extends RhnAction implements Listable {
- private static final String DATA_SET = "pageList";
-
/** {@inheritDoc} */
public ActionForward execute(ActionMapping actionMapping,
ActionForm actionForm,
@@ -54,7 +52,7 @@ public class SelectInstallationPackagesAction extends RhnAction implements Lista
Map params = new HashMap();
params.put(RequestContext.CID, context.getRequiredParam(RequestContext.CID));
ListSessionSetHelper helper = new ListSessionSetHelper(this, request, params);
- helper.setDataSetName(DATA_SET);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.execute();
if (helper.isDispatched()) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectRemovePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectRemovePackagesAction.java
index a3ba999..42d8a2e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectRemovePackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectRemovePackagesAction.java
@@ -42,8 +42,6 @@ import javax.servlet.http.HttpServletResponse;
*/
public class SelectRemovePackagesAction extends RhnAction implements Listable {
- private static final String DATA_SET = "pageList";
-
/** {@inheritDoc} */
public ActionForward execute(ActionMapping actionMapping,
ActionForm actionForm,
@@ -54,7 +52,7 @@ public class SelectRemovePackagesAction extends RhnAction implements Listable {
Map params = new HashMap();
ListSessionSetHelper helper = new ListSessionSetHelper(this, request, params);
- helper.setDataSetName(DATA_SET);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.execute();
if (helper.isDispatched()) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectUpgradePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectUpgradePackagesAction.java
index 1f45e8c..0cf21db 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectUpgradePackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectUpgradePackagesAction.java
@@ -42,8 +42,6 @@ import javax.servlet.http.HttpServletResponse;
*/
public class SelectUpgradePackagesAction extends RhnAction implements Listable {
- private static final String DATA_SET = "pageList";
-
/** {@inheritDoc} */
public ActionForward execute(ActionMapping actionMapping, ActionForm actionForm,
HttpServletRequest request, HttpServletResponse response)
@@ -54,7 +52,7 @@ public class SelectUpgradePackagesAction extends RhnAction implements Listable {
Map params = new HashMap();
ListSessionSetHelper helper = new ListSessionSetHelper(this, request, params);
- helper.setDataSetName(DATA_SET);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.execute();
if (helper.isDispatched()) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectVerifyPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectVerifyPackagesAction.java
index f48c491..3168a28 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectVerifyPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectVerifyPackagesAction.java
@@ -42,8 +42,6 @@ import javax.servlet.http.HttpServletResponse;
*/
public class SelectVerifyPackagesAction extends RhnAction implements Listable {
- private static final String DATA_SET = "pageList";
-
/** {@inheritDoc} */
public ActionForward execute(ActionMapping actionMapping,
ActionForm actionForm,
@@ -54,7 +52,7 @@ public class SelectVerifyPackagesAction extends RhnAction implements Listable {
Map params = new HashMap();
ListSessionSetHelper helper = new ListSessionSetHelper(this, request, params);
- helper.setDataSetName(DATA_SET);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.execute();
if (helper.isDispatched()) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleRemovePackagesActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleRemovePackagesActionTest.java
index 2515333..f1fa0b2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleRemovePackagesActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleRemovePackagesActionTest.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.rhnpackage.ssm.test;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
@@ -41,7 +42,7 @@ public class ScheduleRemovePackagesActionTest extends RhnMockStrutsTestCase {
// Verify
verifyForward(RhnHelper.DEFAULT_FORWARD);
- Object pageList = getRequest().getAttribute("pageList");
+ Object pageList = getRequest().getAttribute(RequestContext.PAGE_LIST);
assertNotNull(pageList);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleVerifyPackagesActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleVerifyPackagesActionTest.java
index c7793bd..3f10ffa 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleVerifyPackagesActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleVerifyPackagesActionTest.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.rhnpackage.ssm.test;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
@@ -41,7 +42,7 @@ public class ScheduleVerifyPackagesActionTest extends RhnMockStrutsTestCase {
// Verify
verifyForward(RhnHelper.DEFAULT_FORWARD);
- Object pageList = getRequest().getAttribute("pageList");
+ Object pageList = getRequest().getAttribute(RequestContext.PAGE_LIST);
assertNotNull(pageList);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectRemovePackagesActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectRemovePackagesActionTest.java
index 74fa1c9..6600709 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectRemovePackagesActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectRemovePackagesActionTest.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.action.rhnpackage.ssm.test;
import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagUtil;
import com.redhat.rhn.frontend.taglibs.list.TagHelper;
@@ -45,7 +46,7 @@ public class SelectRemovePackagesActionTest extends RhnMockStrutsTestCase {
// Verify
verifyForward(RhnHelper.DEFAULT_FORWARD);
- Object pageList = getRequest().getAttribute("pageList");
+ Object pageList = getRequest().getAttribute(RequestContext.PAGE_LIST);
assertNotNull(pageList);
DataResult result = (DataResult)pageList;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectVerifyPackagesActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectVerifyPackagesActionTest.java
index 91b92b2..509a30e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectVerifyPackagesActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectVerifyPackagesActionTest.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.action.rhnpackage.ssm.test;
import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagUtil;
import com.redhat.rhn.frontend.taglibs.list.TagHelper;
@@ -45,7 +46,7 @@ public class SelectVerifyPackagesActionTest extends RhnMockStrutsTestCase {
// Verify
verifyForward(RhnHelper.DEFAULT_FORWARD);
- Object pageList = getRequest().getAttribute("pageList");
+ Object pageList = getRequest().getAttribute(RequestContext.PAGE_LIST);
assertNotNull(pageList);
DataResult result = (DataResult)pageList;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/test/SolarisPatchSetListSetupTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/test/SolarisPatchSetListSetupTest.java
index a176430..c5cf3d0 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/test/SolarisPatchSetListSetupTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/test/SolarisPatchSetListSetupTest.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.rhnpackage.SolarisPatchSetListSetupAction;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
import com.redhat.rhn.testing.RhnMockHttpServletRequest;
@@ -55,7 +56,7 @@ public class SolarisPatchSetListSetupTest extends RhnBaseTestCase {
RhnMockHttpServletRequest request = sah.getRequest();
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertTrue(dr.size() == 0);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/ActionSystemsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/ActionSystemsSetupAction.java
index 3e02237..bf52324 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/ActionSystemsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/ActionSystemsSetupAction.java
@@ -63,7 +63,7 @@ public abstract class ActionSystemsSetupAction extends RhnListAction {
ActionFormatter af = action.getFormatter();
request.setAttribute("actionname", af.getName());
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("user", user);
request.setAttribute("action", action);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedSystemsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedSystemsSetupAction.java
index d50d1b3..5151bcc 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedSystemsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedSystemsSetupAction.java
@@ -56,7 +56,7 @@ public class CompletedSystemsSetupAction extends RhnListAction {
ActionFormatter af = action.getFormatter();
request.setAttribute("actionname", af.getName());
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("user", user);
request.setAttribute("action", action);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/ActionSystemsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/ActionSystemsSetupActionTest.java
index 0165a07..edb4906 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/ActionSystemsSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/ActionSystemsSetupActionTest.java
@@ -25,6 +25,7 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.action.schedule.ActionSystemsSetupAction;
import com.redhat.rhn.frontend.action.schedule.InProgressSystemsSetupAction;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.manager.action.ActionManager;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -72,7 +73,7 @@ public class ActionSystemsSetupActionTest extends RhnBaseTestCase {
sah.getRequest().setupAddParameter("returnvisit", (String) null);
sah.executeAction();
- assertNotNull(sah.getRequest().getAttribute("pageList"));
+ assertNotNull(sah.getRequest().getAttribute(RequestContext.PAGE_LIST));
assertNotNull(sah.getRequest().getAttribute("user"));
assertNotNull(sah.getRequest().getAttribute("action"));
assertNotNull(sah.getRequest().getAttribute("actionname"));
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedSystemsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedSystemsSetupActionTest.java
index f5ac024..cfa613a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedSystemsSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/test/CompletedSystemsSetupActionTest.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.action.ActionFactory;
import com.redhat.rhn.domain.action.test.ActionFactoryTest;
import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.action.schedule.CompletedSystemsSetupAction;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -50,7 +51,7 @@ public class CompletedSystemsSetupActionTest extends RhnBaseTestCase {
String name = (String) sah.getRequest().getAttribute("actionname");
Action a2 = (Action)sah.getRequest().getAttribute("action");
- assertNotNull(sah.getRequest().getAttribute("pageList"));
+ assertNotNull(sah.getRequest().getAttribute(RequestContext.PAGE_LIST));
assertNotNull(sah.getRequest().getAttribute("user"));
assertNotNull(name);
assertEquals("RHN-JAVA Test Action", name);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/BaseViewLogAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/BaseViewLogAction.java
index 04f4c4f..6162986 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/ssm/BaseViewLogAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/BaseViewLogAction.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.ssm;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
@@ -36,8 +37,6 @@ import javax.servlet.http.HttpServletResponse;
*/
public abstract class BaseViewLogAction extends RhnListAction implements Listable {
- private static final String DATA_SET = "pageList";
-
/**
* Allows the subclass to introduce a message key specific to the data it provides.
*
@@ -54,7 +53,7 @@ public abstract class BaseViewLogAction extends RhnListAction implements Listabl
throws Exception {
ListHelper helper = new ListHelper(this, request);
- helper.setDataSetName(DATA_SET);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.execute();
request.setAttribute("summaryKey", getSummaryKey());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java
index 19eeefd..e0abf83 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java
@@ -47,7 +47,7 @@ public class ListSystemsAction extends RhnAction implements Listable {
HttpServletResponse response) {
ListHelper helper = new ListHelper(this, request);
helper.setListName("systemList");
- helper.setDataSetName("pageList");
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.execute();
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/MigrateSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/MigrateSystemsAction.java
index 8d15135..9731a14 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/ssm/MigrateSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/MigrateSystemsAction.java
@@ -94,7 +94,7 @@ public class MigrateSystemsAction extends RhnAction implements Listable {
request.setAttribute("orgs", user.getOrg().getTrustedOrgs());
ListHelper helper = new ListHelper(this, request);
helper.setListName("systemList");
- helper.setDataSetName("pageList");
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.execute();
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogDetailsAction.java
index ac12dab..dbbce55 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogDetailsAction.java
@@ -44,7 +44,6 @@ import javax.servlet.http.HttpServletResponse;
*/
public class ViewLogDetailsAction extends RhnListAction implements Listable {
- private static final String DATA_SET = "pageList";
private static final String PARAM_OPERATION_ID = "oid";
/** {@inheritDoc} */
@@ -65,7 +64,7 @@ public class ViewLogDetailsAction extends RhnListAction implements Listable {
// List stuff for the server list
ListHelper helper = new ListHelper(this, request);
- helper.setDataSetName(DATA_SET);
+ helper.setDataSetName(RequestContext.PAGE_LIST);
Map<String, String> helperParams = new HashMap<String, String>(1);
helperParams.put("oid", request.getParameter("oid"));
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemListSetupAction.java
index b1c25ee..b9b575f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemListSetupAction.java
@@ -62,7 +62,7 @@ public abstract class BaseSystemListSetupAction extends RhnListAction {
setStatusDisplay(dr, user);
request.setAttribute("set", set);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemsAction.java
index f336f8c..6215ef8 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemsAction.java
@@ -71,10 +71,10 @@ public abstract class BaseSystemsAction extends RhnListAction {
}
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
ListTagHelper.bindSetDeclTo("systemList", getSetDecl(), request);
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
TagHelper.bindElaboratorTo("systemList", result.getElaborator(), request);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SSMDeleteSystemsConfirm.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SSMDeleteSystemsConfirm.java
index 4dafa8d..15bd2e9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SSMDeleteSystemsConfirm.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SSMDeleteSystemsConfirm.java
@@ -57,7 +57,7 @@ public class SSMDeleteSystemsConfirm extends RhnAction implements Listable {
ListHelper helper = new ListHelper(this, request);
helper.setListName("systemList");
- helper.setDataSetName("pageList");
+ helper.setDataSetName(RequestContext.PAGE_LIST);
helper.execute();
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemGroupListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemGroupListSetupAction.java
index f91fb3c..22e12ec 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemGroupListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemGroupListSetupAction.java
@@ -63,7 +63,7 @@ public class SystemGroupListSetupAction extends RhnAction {
DataResult result = SystemManager.groupList(user, null);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
ListTagHelper.bindSetDeclTo("groupList", getSetDecl(), request);
TagHelper.bindElaboratorTo("groupList", result.getElaborator(), request);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
index 4e44221..a53bc93 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
@@ -59,7 +59,6 @@ import redstone.xmlrpc.XmlRpcFault;
*/
public class SystemSearchSetupAction extends RhnAction implements Listable {
- public static final String LIST_NAME = "pageList";
public static final String DATA_SET = "searchResults";
public static final String[] OPT_GROUPS_TITLES = { "systemsearch.jsp.details",
@@ -412,7 +411,7 @@ public class SystemSearchSetupAction extends RhnAction implements Listable {
/** {@inheritDoc} */
public String getListName() {
- return LIST_NAME;
+ return RequestContext.PAGE_LIST;
}
/** {@inheritDoc} */
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CustomKeyListAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CustomKeyListAction.java
index 772a834..47f2f12 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CustomKeyListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CustomKeyListAction.java
@@ -48,7 +48,7 @@ public class CustomKeyListAction extends RhnAction {
DataResult result = SystemManager.listDataKeys(user);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/VirtualizationEntitlementsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/VirtualizationEntitlementsAction.java
index 8989deb..8cc30cb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/VirtualizationEntitlementsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/VirtualizationEntitlementsAction.java
@@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletResponse;
*/
public class VirtualizationEntitlementsAction extends MappingDispatchAction {
- public static final String PAGELIST = "pageList";
+ public static final String PAGELIST = RequestContext.PAGE_LIST;
/**
* Initializes the action
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListActionTest.java
index a815a09..bd6d59c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListActionTest.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.common.CommonFactory;
import com.redhat.rhn.domain.common.FileList;
import com.redhat.rhn.domain.common.test.FileListTest;
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.TestUtils;
import com.redhat.rhn.testing.UserTestUtils;
@@ -38,7 +39,7 @@ public class PreservationListActionTest extends RhnMockStrutsTestCase {
TestUtils.flushAndEvict(f);
setRequestPathInfo("/systems/provisioning/preservation/PreservationList");
actionPerform();
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertTrue(dr.size() > 0);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListConfirmDeleteActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListConfirmDeleteActionTest.java
index 9cd077a..c4a0182 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListConfirmDeleteActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListConfirmDeleteActionTest.java
@@ -78,7 +78,7 @@ public class PreservationListConfirmDeleteActionTest extends RhnBaseTestCase {
user = requestContext.getLoggedInUser();
set = (RhnSet) request.getAttribute("set");
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertTrue(dr.size() > 0);
assertNotNull(set);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java
index 434253e..23e8a0e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java
@@ -61,7 +61,7 @@ public class CreateCustomDataAction extends RhnAction {
server.getOrg().getId(), sid);
requestContext.getRequiredParam(RequestContext.SID);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- request.setAttribute("pageList", result);
+ request.setAttribute(RequestContext.PAGE_LIST, result);
request.setAttribute("system", server);
return getStrutsDelegate().forwardParams(
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/ListCustomDataAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/ListCustomDataAction.java
index 116c5ac..c3f28f8 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/ListCustomDataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/ListCustomDataAction.java
@@ -92,7 +92,7 @@ public class ListCustomDataAction extends RhnAction {
pageList.add(returnMap);
}
- request.setAttribute("pageList", pageList);
+ request.setAttribute(RequestContext.PAGE_LIST, pageList);
request.setAttribute("system", server);
return getStrutsDelegate().forwardParams(
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/NoteListAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/NoteListAction.java
index f99016d..c3476ae 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/NoteListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/NoteListAction.java
@@ -57,7 +57,7 @@ public class NoteListAction extends RhnListAction {
DataResult dr = SystemManager.systemNotes(s);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("sid", sid);
request.setAttribute("system", s);
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 cd8b51c..62dc5d1 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
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.server.ServerGroup;
import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.domain.server.test.ServerGroupTest;
import com.redhat.rhn.frontend.action.systems.RegisteredSetupAction;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.manager.system.SystemManager;
import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
@@ -54,7 +55,7 @@ public class RegisteredSetupActionTest extends RhnPostMockStrutsTestCase {
request.addParameter("threshold", RegisteredSetupAction.OPTIONS[j]);
actionPerform();
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertFalse(dr.isEmpty());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java
index 40dd0c8..1fa0b7c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java
@@ -25,6 +25,7 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.frontend.action.systems.SystemListSetupAction;
import com.redhat.rhn.frontend.dto.SystemOverview;
import com.redhat.rhn.frontend.listview.PageControl;
+import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.manager.system.SystemManager;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
@@ -44,7 +45,7 @@ public class SystemListSetupActionTest extends RhnMockStrutsTestCase {
public void testPerformExecute() throws Exception {
ServerFactoryTest.createTestServer(user, true);
actionPerform();
- DataResult dr = (DataResult) request.getAttribute("pageList");
+ DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertTrue(dr.size() > 0);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmSetupAction.java
index b7dc81e..dca700f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmSetupAction.java
@@ -79,7 +79,7 @@ public class VirtualGuestsConfirmSetupAction extends BaseSystemListSetupAction {
Server server = SystemManager.lookupByIdAndUser(sid, user);
request.setAttribute("set", set);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("system", server);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java
index e835215..f21bc35 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java
@@ -92,7 +92,7 @@ public class VirtualGuestsListSetupAction extends BaseSystemListSetupAction {
SdcHelper.ssmCheck(request, sid, user);
request.setAttribute("set", set);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("system", server);
request.setAttribute("actionOptions", getActionOptions());
request.setAttribute("guestSettingOptions", getGuestSettingOptions());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java
index ff2f410..aa1946f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java
@@ -46,7 +46,7 @@ import javax.servlet.http.HttpServletResponse;
*/
public class ActivationKeysListAction extends RhnAction {
private static final String LIST_NAME = "activationKeys";
- private static final String DATA_SET = "pageList";
+ private static final String DATA_SET = RequestContext.PAGE_LIST;
private static final String DEFAULT_KEY = "default";
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java
index 498e908..401a298 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java
@@ -140,7 +140,7 @@ public class AssignedGroupsSetupAction extends RhnListAction {
ListTagHelper.bindSetDeclTo(LIST_NAME, getSetDecl(), request);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java
index 671532e..f3dc1f5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java
@@ -73,7 +73,7 @@ public class ChannelManagementPermsSetupAction extends RhnListAction {
}
}
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("user", user);
request.setAttribute("role", "manage");
request.setAttribute("userIsChannelAdmin",
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java
index 9f36cc1..7375151 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java
@@ -78,7 +78,7 @@ public class ChannelPermsSetupAction extends RhnListAction {
}
}
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("user", user);
request.setAttribute("role", "subscribe");
request.setAttribute("userIsChannelAdmin",
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/DisabledListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/DisabledListSetupAction.java
index feb0dd7..0196a6c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/DisabledListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/DisabledListSetupAction.java
@@ -94,7 +94,7 @@ public class DisabledListSetupAction extends RhnAction {
ListTagHelper.setSelectedAmount(LIST_NAME, set.size(), request);
}
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("set", set);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java
index d6e2bfe..5607d0e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java
@@ -91,7 +91,7 @@ public class EnableConfirmSetupAction extends RhnListAction {
clampListBounds(pc, request, user);
DataResult dr = UserManager.usersInSet(user, "user_list", pc);
dr.setElaborationParams(Collections.EMPTY_MAP);
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/EnabledListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/EnabledListSetupAction.java
index d643295..9b6a2f8 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/EnabledListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/EnabledListSetupAction.java
@@ -52,7 +52,7 @@ public class EnabledListSetupAction extends RhnAction implements Listable {
* ${@inheritDoc}
*/
public String getDataSetName() {
- return "pageList";
+ return RequestContext.PAGE_LIST;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListSetupAction.java
index 3761242..016b8c9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListSetupAction.java
@@ -57,7 +57,7 @@ public class VisibleSystemsListSetupAction extends RhnListAction {
//we want set to change for logged in user rather than the target user
RhnSet set = RhnSetDecl.SYSTEMS.get(requestContext.getLoggedInUser());
- request.setAttribute("pageList", dr);
+ request.setAttribute(RequestContext.PAGE_LIST, dr);
request.setAttribute("user", user);
request.setAttribute("set", set);
commit fbf1623f38d66f29c69f0e76c2d6cb6a55708265
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jun 1 18:57:21 2012 +0200
Refactor struts "default" forward also in /tests.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/test/AllChannelTreeActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/channel/test/AllChannelTreeActionTest.java
index 12a3da1..a8d541e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/test/AllChannelTreeActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/test/AllChannelTreeActionTest.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.channel.AllChannelTreeAction;
import com.redhat.rhn.frontend.listview.ListControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.channel.ChannelManager;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -40,7 +41,7 @@ public class AllChannelTreeActionTest extends RhnBaseTestCase {
}
};
ActionHelper sah = new ActionHelper();
- sah.setUpAction(action, "default");
+ sah.setUpAction(action, RhnHelper.DEFAULT_FORWARD);
sah.getRequest().setupAddParameter(RequestContext.FILTER_STRING, (String) null);
User user = sah.getUser();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/test/ChannelEntitlementSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/channel/test/ChannelEntitlementSetupActionTest.java
index 5747b8c..07f31b6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/test/ChannelEntitlementSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/test/ChannelEntitlementSetupActionTest.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.channel.ChannelEntitlementSetupAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -34,7 +35,7 @@ public class ChannelEntitlementSetupActionTest extends RhnBaseTestCase {
ChannelEntitlementSetupAction action = new ChannelEntitlementSetupAction();
ActionHelper sah = new ActionHelper();
- sah.setUpAction(action, "default");
+ sah.setUpAction(action, RhnHelper.DEFAULT_FORWARD);
sah.getRequest().setupAddParameter(RequestContext.FILTER_STRING, (String) null);
User user = sah.getUser();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/test/RetiredChannelTreeActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/channel/test/RetiredChannelTreeActionTest.java
index 3f98c8a..6fcea4c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/test/RetiredChannelTreeActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/test/RetiredChannelTreeActionTest.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.channel.RetiredChannelTreeAction;
import com.redhat.rhn.frontend.listview.ListControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.channel.ChannelManager;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -41,7 +42,7 @@ public class RetiredChannelTreeActionTest extends RhnBaseTestCase {
}
};
ActionHelper sah = new ActionHelper();
- sah.setUpAction(action, "default");
+ sah.setUpAction(action, RhnHelper.DEFAULT_FORWARD);
sah.getRequest().setupAddParameter(RequestContext.FILTER_STRING, (String) null);
User user = sah.getUser();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/AffectedSystemsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/AffectedSystemsActionTest.java
index 15bfa35..ee111b8 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/AffectedSystemsActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/AffectedSystemsActionTest.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.SetLabels;
import com.redhat.rhn.frontend.action.common.test.RhnSetActionTest;
import com.redhat.rhn.frontend.action.errata.AffectedSystemsAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnMockDynaActionForm;
import com.redhat.rhn.testing.RhnMockHttpServletRequest;
@@ -52,7 +53,7 @@ public class AffectedSystemsActionTest extends MockObjectTestCase {
Mock mapping = mock(ActionMapping.class, "mapping");
mapping.expects(once())
.method("findForward")
- .with(eq("default"))
+ .with(eq(RhnHelper.DEFAULT_FORWARD))
.will(returnValue(forward));
request.setupAddParameter("items_selected", (String[])null);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/BaseErrataSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/BaseErrataSetupActionTest.java
index ce084bd..44580d5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/BaseErrataSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/BaseErrataSetupActionTest.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.errata.test.ErrataFactoryTest;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.errata.BaseErrataSetupAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
import com.redhat.rhn.testing.RhnMockDynaActionForm;
import com.redhat.rhn.testing.RhnMockHttpServletRequest;
@@ -40,7 +41,7 @@ public class BaseErrataSetupActionTest extends RhnBaseTestCase {
BaseErrataSetupAction action = new BaseErrataSetupAction();
ActionMapping mapping = new ActionMapping();
- ActionForward def = new ActionForward("default", "path", false);
+ ActionForward def = new ActionForward(RhnHelper.DEFAULT_FORWARD, "path", false);
RhnMockDynaActionForm form = new RhnMockDynaActionForm();
RhnMockHttpServletRequest request = TestUtils.getRequestWithSessionAndUser();
MockHttpServletResponse response = new MockHttpServletResponse();
@@ -65,7 +66,7 @@ public class BaseErrataSetupActionTest extends RhnBaseTestCase {
//test default case
request.setupAddParameter("eid", published.getId().toString());
ActionForward result = action.execute(mapping, form, request, response);
- assertEquals("default", result.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, result.getName());
assertNotNull(request.getAttribute("advisory"));
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelActionTest.java
index a8207af..404eb3f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelActionTest.java
@@ -25,6 +25,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.errata.ChannelAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.errata.ErrataManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.testing.ActionHelper;
@@ -50,7 +51,7 @@ public class ChannelActionTest extends RhnBaseTestCase {
ChannelAction action = new ChannelAction();
ActionMapping mapping = new ActionMapping();
- ActionForward def = new ActionForward("default", "path", true);
+ ActionForward def = new ActionForward(RhnHelper.DEFAULT_FORWARD, "path", true);
ActionForward publish = new ActionForward("publish", "path", true);
ActionForward failure = new ActionForward("failure", "path", false);
mapping.addForwardConfig(def);
@@ -97,7 +98,7 @@ public class ChannelActionTest extends RhnBaseTestCase {
ChannelAction action = new ChannelAction();
ActionMapping mapping = new ActionMapping();
- ActionForward def = new ActionForward("default", "path", true);
+ ActionForward def = new ActionForward(RhnHelper.DEFAULT_FORWARD, "path", true);
ActionForward failure = new ActionForward("failure", "path", false);
ActionForward push = new ActionForward("push", "path", false);
mapping.addForwardConfig(def);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelSetupActionTest.java
index b9b2182..3457b79 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelSetupActionTest.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.errata.ChannelSetupAction;
import com.redhat.rhn.frontend.dto.ChannelOverview;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.errata.ErrataManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
@@ -78,7 +79,7 @@ public class ChannelSetupActionTest extends RhnBaseTestCase {
//make sure set was set
assertNotNull(sah.getRequest().getAttribute("set"));
- assertEquals(result.getName(), "default");
+ assertEquals(result.getName(), RhnHelper.DEFAULT_FORWARD);
//get the data result back out of the request and inspect
DataResult dr = (DataResult) sah.getRequest().getAttribute("pageList");
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 e6ff304..950d8db 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
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.rhnset.RhnSetFactory;
import com.redhat.rhn.domain.rhnset.SetCleanup;
import com.redhat.rhn.domain.role.RoleFactory;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.errata.ErrataManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
@@ -71,7 +72,7 @@ public class CloneConfirmActionTest extends RhnPostMockStrutsTestCase {
request.addParameter("dispatch", "Confirm");
actionPerform();
- verifyForward("default");
+ verifyForward(RhnHelper.DEFAULT_FORWARD);
set = RhnSetDecl.ERRATA_CLONE.get(user);
assertEquals(0, set.size());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneErrataActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneErrataActionTest.java
index 1647311..70b51d5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneErrataActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/CloneErrataActionTest.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.rhnset.RhnSetFactory;
import com.redhat.rhn.domain.rhnset.SetCleanup;
import com.redhat.rhn.domain.role.RoleFactory;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
@@ -76,6 +77,6 @@ public class CloneErrataActionTest extends RhnMockStrutsTestCase {
request.addParameter("dispatch", "Clone Errata");
actionPerform();
- verifyForward("default");
+ verifyForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/DeleteBugActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/DeleteBugActionTest.java
index 1bba5ee..8b8eca0 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/DeleteBugActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/DeleteBugActionTest.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.errata.test.ErrataFactoryTest;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.errata.DeleteBugAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.errata.ErrataManager;
import com.redhat.rhn.manager.errata.test.ErrataManagerTest;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -42,7 +43,7 @@ public class DeleteBugActionTest extends RhnBaseTestCase {
DeleteBugAction action = new DeleteBugAction();
ActionMapping mapping = new ActionMapping();
- ActionForward def = new ActionForward("default", "path", true);
+ ActionForward def = new ActionForward(RhnHelper.DEFAULT_FORWARD, "path", true);
mapping.addForwardConfig(def);
RhnMockHttpServletRequest request = TestUtils.getRequestWithSessionAndUser();
@@ -71,7 +72,7 @@ public class DeleteBugActionTest extends RhnBaseTestCase {
request.setupAddParameter("bid", bugId.toString());
ActionForward result = action.execute(mapping, form, request, response);
- assertEquals(result.getName(), "default");
+ assertEquals(result.getName(), RhnHelper.DEFAULT_FORWARD);
flushAndEvict(e); //get rid of e
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/EditActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/EditActionTest.java
index 5c5879c..36bc5f2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/EditActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/EditActionTest.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.errata.test.ErrataFactoryTest;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.errata.EditAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.errata.ErrataManager;
import com.redhat.rhn.testing.RhnBaseTestCase;
import com.redhat.rhn.testing.RhnMockDynaActionForm;
@@ -44,7 +45,7 @@ public class EditActionTest extends RhnBaseTestCase {
EditAction action = new EditAction();
ActionMapping mapping = new ActionMapping();
- ActionForward def = new ActionForward("default", "path", false);
+ ActionForward def = new ActionForward(RhnHelper.DEFAULT_FORWARD, "path", false);
ActionForward failure = new ActionForward("failure", "path", false);
ActionForward success = new ActionForward("updated", "path", true);
mapping.addForwardConfig(def);
@@ -72,7 +73,7 @@ public class EditActionTest extends RhnBaseTestCase {
//Execute setupAction to fillout form
ActionForward result = action.unspecified(mapping, form, request, response);
- assertEquals("default", result.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, result.getName());
//make sure form was filled out
assertEquals(form.get("synopsis"), errata.getSynopsis());
//add empty buglistId & buglistSummary so validator doesn't freak out
@@ -84,20 +85,20 @@ public class EditActionTest extends RhnBaseTestCase {
request.setupAddParameter("eid", errata.getId().toString());
form.set("synopsis", ""); //required field, so we should get a validation error
result = action.update(mapping, form, request, response);
- assertEquals("default", result.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, result.getName());
//make sure adv name has to be unique
request.setupAddParameter("eid", errata.getId().toString());
form.set("synopsis", "this errata has been edited");
form.set("advisoryName", errata2.getAdvisoryName());
result = action.update(mapping, form, request, response);
- assertEquals("default", result.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, result.getName());
//make sure adv name cannot start with rh
request.setupAddParameter("eid", errata.getId().toString());
form.set("advisoryName", "rh" + TestUtils.randomString());
result = action.update(mapping, form, request, response);
- assertEquals("default", result.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, result.getName());
//make sure we can edit an errata
String newAdvisoryName = errata.getAdvisoryName() + "edited";
@@ -124,7 +125,7 @@ public class EditActionTest extends RhnBaseTestCase {
request.setupAddParameter("buglistUrlNew",
"https://bugzilla.redhat.com/show_bug.cgi?id=123");
result = action.update(mapping, form, request, response);
- assertEquals("default", result.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, result.getName());
//errata has now been edited... let's look it back up from the db and make sure
//our changes were saved.
@@ -143,7 +144,7 @@ public class EditActionTest extends RhnBaseTestCase {
EditAction action = new EditAction();
ActionMapping mapping = new ActionMapping();
- ActionForward def = new ActionForward("default", "path", false);
+ ActionForward def = new ActionForward(RhnHelper.DEFAULT_FORWARD, "path", false);
RhnMockDynaActionForm form = new RhnMockDynaActionForm();
RhnMockHttpServletRequest request = TestUtils.getRequestWithSessionAndUser();
MockHttpServletResponse response = new MockHttpServletResponse();
@@ -160,7 +161,7 @@ public class EditActionTest extends RhnBaseTestCase {
assertNull(form.get("synopsis"));
//execute the action
ActionForward result = action.unspecified(mapping, form, request, response);
- assertEquals(result.getName(), "default");
+ assertEquals(result.getName(), RhnHelper.DEFAULT_FORWARD);
//make sure form was filled out properly
assertEquals(form.get("synopsis"), errata.getSynopsis());
assertEquals(form.get("advisoryName"), errata.getAdvisoryName());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/NotifyActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/NotifyActionTest.java
index 5f14e23..0a20a9e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/NotifyActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/NotifyActionTest.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.errata.test.ErrataFactoryTest;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.errata.NotifyAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.errata.ErrataManager;
import com.redhat.rhn.testing.RhnBaseTestCase;
import com.redhat.rhn.testing.RhnMockDynaActionForm;
@@ -44,7 +45,7 @@ public class NotifyActionTest extends RhnBaseTestCase {
RhnMockHttpServletRequest request = TestUtils.getRequestWithSessionAndUser();
ActionMapping mapping = new ActionMapping();
- ActionForward def = new ActionForward("default", "path", false);
+ ActionForward def = new ActionForward(RhnHelper.DEFAULT_FORWARD, "path", false);
RhnMockDynaActionForm form = new RhnMockDynaActionForm();
MockHttpServletResponse response = new MockHttpServletResponse();
mapping.addForwardConfig(def);
@@ -72,7 +73,7 @@ public class NotifyActionTest extends RhnBaseTestCase {
//test default case
request.setupAddParameter("eid", published.getId().toString());
ActionForward result = action.execute(mapping, form, request, response);
- assertEquals("default", result.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, result.getName());
Long id = published.getId();
flushAndEvict(published);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/NotifySetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/NotifySetupActionTest.java
index d870352..ae57162 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/NotifySetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/NotifySetupActionTest.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.action.errata.NotifySetupAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
import com.redhat.rhn.testing.RhnMockDynaActionForm;
import com.redhat.rhn.testing.RhnMockHttpServletRequest;
@@ -40,7 +41,7 @@ public class NotifySetupActionTest extends RhnBaseTestCase {
NotifySetupAction action = new NotifySetupAction();
ActionMapping mapping = new ActionMapping();
- ActionForward def = new ActionForward("default", "path", false);
+ ActionForward def = new ActionForward(RhnHelper.DEFAULT_FORWARD, "path", false);
RhnMockDynaActionForm form = new RhnMockDynaActionForm();
RhnMockHttpServletRequest request = TestUtils.getRequestWithSessionAndUser();
MockHttpServletResponse response = new MockHttpServletResponse();
@@ -68,7 +69,7 @@ public class NotifySetupActionTest extends RhnBaseTestCase {
request.setupAddParameter("eid", published.getId().toString());
request.setupAddParameter("eid", unpublished.getId().toString());
ActionForward result = action.execute(mapping, form, request, response);
- assertEquals("default", result.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, result.getName());
assertNotNull(request.getAttribute("advisory"));
}
}
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 f210e54..b00ccc9 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
@@ -29,6 +29,7 @@ import com.redhat.rhn.frontend.action.kickstart.tree.TreeCreateAction;
import com.redhat.rhn.frontend.action.kickstart.tree.TreeEditAction;
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.rhnpackage.test.PackageManagerTest;
import com.redhat.rhn.testing.ChannelTestUtils;
import com.redhat.rhn.testing.RhnPostMockStrutsTestCase;
@@ -234,7 +235,7 @@ public class TreeActionTest extends RhnPostMockStrutsTestCase {
setRequestPathInfo("/kickstart/TreeDelete");
actionPerform();
verifyNoActionErrors();
- verifyForward("default");
+ verifyForward(RhnHelper.DEFAULT_FORWARD);
assertNotNull(request.getAttribute(RequestContext.PAGE_LIST));
verifyPageList(KickstartData.class);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java
index 53e56fe..39ab377 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java
@@ -35,6 +35,7 @@ import com.redhat.rhn.frontend.action.systems.monitoring.test.ProbeDetailsAction
import com.redhat.rhn.frontend.context.Context;
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.MonitoringManager;
import com.redhat.rhn.manager.satellite.ConfigureSatelliteCommand;
import com.redhat.rhn.testing.ActionHelper;
@@ -128,7 +129,7 @@ public class FilterActionTest extends RhnBaseTestCase {
public void testCreateExecute() throws Exception {
- setUpAction(new FilterCreateAction(), "default");
+ setUpAction(new FilterCreateAction(), RhnHelper.DEFAULT_FORWARD);
executeNonSubmit();
}
@@ -155,7 +156,7 @@ public class FilterActionTest extends RhnBaseTestCase {
public void testCreateSubmitFailValidation() throws Exception {
action = new FilterCreateAction();
- setUpAction(action, "default");
+ setUpAction(action, RhnHelper.DEFAULT_FORWARD);
ah.getForm().set(RhnAction.SUBMITTED, new Boolean(true));
ah.getForm().set(FilterCreateAction.DESCRIPTION, "");
ah.getForm().set(FilterCreateAction.RECURRING_DURATION, "");
@@ -208,7 +209,7 @@ public class FilterActionTest extends RhnBaseTestCase {
public void testEditExecute() throws Exception {
- setUpAction(new FilterEditAction(), "default");
+ setUpAction(new FilterEditAction(), RhnHelper.DEFAULT_FORWARD);
filter.setRecurringDuration(new Long(TEST_DURATION));
filter.setRecurringFrequency(new Long(Calendar.MONTH));
filter.setRecurringDurationType(new Long(Calendar.MINUTE));
@@ -227,7 +228,7 @@ public class FilterActionTest extends RhnBaseTestCase {
}
public void testLongRecurDuration() throws Exception {
- setUpAction(new FilterEditAction(), "default");
+ setUpAction(new FilterEditAction(), RhnHelper.DEFAULT_FORWARD);
filter.setRecurringDuration(new Long(364240800));
filter.setRecurringDurationType(new Long(Calendar.YEAR));
executeNonSubmit();
@@ -295,7 +296,7 @@ public class FilterActionTest extends RhnBaseTestCase {
private void executeNonSubmit() throws Exception {
ActionForward af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
assertNotNull(ah.getRequest().getAttribute("filter"));
assertNotNull(ah.getRequest().getAttribute("start"));
assertNotNull(ah.getRequest().getAttribute("filterTypes"));
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteActionTest.java
index fce5dfd..705ce85 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteActionTest.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.frontend.action.monitoring.ProbeSuiteCreateAction;
import com.redhat.rhn.frontend.action.monitoring.ProbeSuiteEditAction;
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.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
import com.redhat.rhn.testing.TestUtils;
@@ -86,11 +87,11 @@ public class ProbeSuiteActionTest extends RhnBaseTestCase {
public void testSubmitFailValidation() throws Exception {
- setUpAction(new ProbeSuiteCreateAction(), "default");
+ setUpAction(new ProbeSuiteCreateAction(), RhnHelper.DEFAULT_FORWARD);
ah.getForm().set(RhnAction.SUBMITTED, new Boolean(true));
ah.getForm().set("suite_name", "");
ActionForward af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
ActionMessages messages = (ActionMessages)
ah.getRequest().getSession().getAttribute(Globals.ERROR_KEY);
assertEquals(1, messages.size());
@@ -98,9 +99,9 @@ public class ProbeSuiteActionTest extends RhnBaseTestCase {
}
private void executeNonSubmit(Action actionIn) throws Exception {
- setUpAction(actionIn, "default");
+ setUpAction(actionIn, RhnHelper.DEFAULT_FORWARD);
ActionForward af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
assertNotNull(ah.getRequest().getAttribute("probeSuite"));
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteProbeEditActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteProbeEditActionTest.java
index ba4e9f3..ea2224e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteProbeEditActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteProbeEditActionTest.java
@@ -27,6 +27,7 @@ import com.redhat.rhn.frontend.action.monitoring.ProbeSuiteProbeEditAction;
import com.redhat.rhn.frontend.action.systems.monitoring.ProbeDetailsAction;
import com.redhat.rhn.frontend.action.systems.monitoring.ProbeEditAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
import com.redhat.rhn.testing.UserTestUtils;
@@ -68,9 +69,9 @@ public class ProbeSuiteProbeEditActionTest extends RhnBaseTestCase {
}
public void testExecute() throws Exception {
- ActionHelper ah = createActionHelper("default");
+ ActionHelper ah = createActionHelper(RhnHelper.DEFAULT_FORWARD);
ActionForward af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
assertNotNull(ah.getRequest().getAttribute("probe"));
assertNotNull(ah.getRequest().getAttribute("probeSuite"));
assertNotNull(ah.getRequest().getAttribute("intervals"));
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsEditActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsEditActionTest.java
index ff75d99..9741c5a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsEditActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/test/ProbeSuiteSystemsEditActionTest.java
@@ -34,6 +34,7 @@ import com.redhat.rhn.frontend.action.monitoring.ProbeSuiteSystemsEditSetupActio
import com.redhat.rhn.frontend.dto.SystemOverview;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.user.UserManager;
@@ -101,7 +102,7 @@ public class ProbeSuiteSystemsEditActionTest extends RhnBaseTestCase {
pc.setStart(1);
}
};
- setUpAction(a, "default");
+ setUpAction(a, RhnHelper.DEFAULT_FORWARD);
//Add a ServerProbe to the suite.
TemplateProbe tprobe = (TemplateProbe) MonitoringFactoryTest.
createTestProbe(user, MonitoringConstants.getProbeTypeSuite());
@@ -170,7 +171,7 @@ public class ProbeSuiteSystemsEditActionTest extends RhnBaseTestCase {
}
public void testSelectAll() throws Exception {
- setUpAction(new ProbeSuiteSystemsEditAction(), "default");
+ setUpAction(new ProbeSuiteSystemsEditAction(), RhnHelper.DEFAULT_FORWARD);
TemplateProbe tprobe = (TemplateProbe) MonitoringFactoryTest.
createTestProbe(user, MonitoringConstants.getProbeTypeSuite());
suite.addProbe(tprobe, user);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleRemovePackagesActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleRemovePackagesActionTest.java
index 9d365e0..2515333 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleRemovePackagesActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleRemovePackagesActionTest.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.rhnpackage.ssm.test;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
/**
@@ -38,7 +39,7 @@ public class ScheduleRemovePackagesActionTest extends RhnMockStrutsTestCase {
actionPerform();
// Verify
- verifyForward("default");
+ verifyForward(RhnHelper.DEFAULT_FORWARD);
Object pageList = getRequest().getAttribute("pageList");
assertNotNull(pageList);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleVerifyPackagesActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleVerifyPackagesActionTest.java
index ba1b9ec..c7793bd 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleVerifyPackagesActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/ScheduleVerifyPackagesActionTest.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.rhnpackage.ssm.test;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.testing.RhnMockStrutsTestCase;
/**
@@ -38,7 +39,7 @@ public class ScheduleVerifyPackagesActionTest extends RhnMockStrutsTestCase {
actionPerform();
// Verify
- verifyForward("default");
+ verifyForward(RhnHelper.DEFAULT_FORWARD);
Object pageList = getRequest().getAttribute("pageList");
assertNotNull(pageList);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectRemovePackagesActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectRemovePackagesActionTest.java
index 5481313..74fa1c9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectRemovePackagesActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectRemovePackagesActionTest.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.action.rhnpackage.ssm.test;
import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagUtil;
import com.redhat.rhn.frontend.taglibs.list.TagHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
@@ -42,7 +43,7 @@ public class SelectRemovePackagesActionTest extends RhnMockStrutsTestCase {
actionPerform();
// Verify
- verifyForward("default");
+ verifyForward(RhnHelper.DEFAULT_FORWARD);
Object pageList = getRequest().getAttribute("pageList");
assertNotNull(pageList);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectVerifyPackagesActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectVerifyPackagesActionTest.java
index 780a777..91b92b2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectVerifyPackagesActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectVerifyPackagesActionTest.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.action.rhnpackage.ssm.test;
import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagUtil;
import com.redhat.rhn.frontend.taglibs.list.TagHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
@@ -42,7 +43,7 @@ public class SelectVerifyPackagesActionTest extends RhnMockStrutsTestCase {
actionPerform();
// Verify
- verifyForward("default");
+ verifyForward(RhnHelper.DEFAULT_FORWARD);
Object pageList = getRequest().getAttribute("pageList");
assertNotNull(pageList);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/test/InstallPatchSetSetupTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/test/InstallPatchSetSetupTest.java
index 2804af2..7da2c19 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/test/InstallPatchSetSetupTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/test/InstallPatchSetSetupTest.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.rhnpackage.InstallPatchSetSetupAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
import com.redhat.rhn.testing.RhnMockDynaActionForm;
import com.redhat.rhn.testing.RhnMockHttpServletRequest;
@@ -51,7 +52,7 @@ public class InstallPatchSetSetupTest extends RhnBaseTestCase {
Server system = ServerFactoryTest.createTestServer(user);
ActionMapping mapping = new ActionMapping();
- ActionForward def = new ActionForward("default", "path", false);
+ ActionForward def = new ActionForward(RhnHelper.DEFAULT_FORWARD, "path", false);
RhnMockDynaActionForm form = new RhnMockDynaActionForm();
MockHttpServletResponse response = new MockHttpServletResponse();
mapping.addForwardConfig(def);
@@ -61,6 +62,6 @@ public class InstallPatchSetSetupTest extends RhnBaseTestCase {
//execute the action
ActionForward result = action.execute(mapping, form, request, response);
- assertEquals(result.getName(), "default");
+ assertEquals(result.getName(), RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/MonitoringConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/MonitoringConfigActionTest.java
index f1bdc3c..8b07f13 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/MonitoringConfigActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/MonitoringConfigActionTest.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.monitoring.config.ConfigMacro;
import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.satellite.MonitoringConfigAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -79,7 +80,7 @@ public class MonitoringConfigActionTest extends RhnBaseTestCase {
setupExpectedProperties(ah);
ActionForward af = ah.executeAction();
assertFalse(restartCalled);
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
assertNotNull(ah.getRequest().getAttribute("configList"));
assertNotNull(ah.getForm().get(MonitoringConfigAction.IS_MONITORING_SCOUT));
@@ -118,7 +119,7 @@ public class MonitoringConfigActionTest extends RhnBaseTestCase {
assertTrue(restartCalled);
assertEquals(!oldScoutValue,
Config.get().getBoolean(ConfigDefaults.WEB_IS_MONITORING_SCOUT));
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
assertNotNull(ah.getRequest().getAttribute("configList"));
// Check that it saved
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java
index 2e0839f..09691db 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeCreateTestCase.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.systems.monitoring.BaseProbeAction;
import com.redhat.rhn.frontend.action.systems.monitoring.BaseProbeCreateAction;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.monitoring.ModifyProbeCommand;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.ForwardWrapper;
@@ -66,7 +67,7 @@ public abstract class ProbeCreateTestCase extends RhnBaseTestCase {
}
public final void testMissingParams() throws Exception {
- modifyActionHelper("default");
+ modifyActionHelper(RhnHelper.DEFAULT_FORWARD);
Probe orig = MonitoringFactoryTest.createTestProbe(user);
@@ -80,16 +81,16 @@ public abstract class ProbeCreateTestCase extends RhnBaseTestCase {
MonitoringTestUtils.setupParamValues(ah, params, 3);
ForwardWrapper af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
}
public final void testExecute() throws Exception {
- modifyActionHelper("default");
+ modifyActionHelper(RhnHelper.DEFAULT_FORWARD);
setupCommand(ah, null);
ForwardWrapper af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
Command command = (Command) ah.getRequest().getAttribute("command");
assertNotNull(command);
assertEquals(command.getName(), ModifyProbeCommand.COMMAND_DEFAULT);
@@ -113,7 +114,7 @@ public abstract class ProbeCreateTestCase extends RhnBaseTestCase {
}
public final void testSelectedCommand() throws Exception {
- modifyActionHelper("default");
+ modifyActionHelper(RhnHelper.DEFAULT_FORWARD);
RhnMockHttpSession session = (RhnMockHttpSession) ah.getRequest().getSession();
session.setAttribute(
BaseProbeCreateAction.SELECTED_COMMAND_GROUP_SESSION, "tools");
@@ -123,7 +124,7 @@ public abstract class ProbeCreateTestCase extends RhnBaseTestCase {
setupCommand(ah, null);
ForwardWrapper af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
Command command = (Command) ah.getRequest().getAttribute("command");
assertNotNull(command);
assertEquals("tools", command.getCommandGroup().getGroupName());
@@ -135,7 +136,7 @@ public abstract class ProbeCreateTestCase extends RhnBaseTestCase {
Probe orig = MonitoringFactoryTest.createTestProbe(user);
- modifyActionHelper("default");
+ modifyActionHelper(RhnHelper.DEFAULT_FORWARD);
ah.getForm().set(RhnAction.SUBMITTED, Boolean.TRUE);
setupCommand(ah, orig);
setupProbeFields(ah, orig);
@@ -147,7 +148,7 @@ public abstract class ProbeCreateTestCase extends RhnBaseTestCase {
MonitoringTestUtils.setupParamValues(ah, params, 3);
ForwardWrapper af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
}
protected abstract BaseProbeAction createProbeAction();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDeleteActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDeleteActionTest.java
index 9157dd8..03a195d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDeleteActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDeleteActionTest.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.systems.monitoring.ProbeDeleteAction;
import com.redhat.rhn.frontend.action.systems.monitoring.ProbeDetailsAction;
import com.redhat.rhn.frontend.action.systems.monitoring.ProbeEditAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -62,9 +63,9 @@ public class ProbeDeleteActionTest extends RhnBaseTestCase {
public void testExecute() throws Exception {
- setUpAction("default");
+ setUpAction(RhnHelper.DEFAULT_FORWARD);
ActionForward af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
assertNotNull(ah.getRequest().getAttribute("probe"));
assertNotNull(ah.getRequest().getAttribute("system"));
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDetailsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDetailsActionTest.java
index 88b79b7..9309fd6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDetailsActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDetailsActionTest.java
@@ -29,6 +29,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.systems.monitoring.ProbeDetailsAction;
import com.redhat.rhn.frontend.context.Context;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.manager.monitoring.test.MonitoringManagerTest;
import com.redhat.rhn.testing.ActionHelper;
@@ -112,7 +113,7 @@ public class ProbeDetailsActionTest extends RhnBaseTestCase {
ah.getRequest().setupGetParameterMap(ah.getForm().getMap());
ActionForward af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
assertNotNull(ah.getRequest().getAttribute("probe"));
assertNotNull(ah.getRequest().getAttribute("system"));
assertNotNull(ah.getRequest().getAttribute("status_class"));
@@ -161,7 +162,7 @@ public class ProbeDetailsActionTest extends RhnBaseTestCase {
setupBadDatePicker(ah.getForm().getMap(), "end");
ActionForward af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
DatePicker start = (DatePicker) ah.getRequest().getAttribute("start");
DatePicker end = (DatePicker) ah.getRequest().getAttribute("end");
assertNotNull(start.getDate());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeEditActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeEditActionTest.java
index 5d2a594..2db8668 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeEditActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeEditActionTest.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.systems.monitoring.ProbeDetailsAction;
import com.redhat.rhn.frontend.action.systems.monitoring.ProbeEditAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -76,7 +77,7 @@ public class ProbeEditActionTest extends RhnBaseTestCase {
ActionForward af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
assertNotNull(ah.getRequest().getAttribute("probe"));
assertNotNull(ah.getRequest().getAttribute("system"));
assertNotNull(ah.getRequest().getAttribute("intervals"));
@@ -117,7 +118,7 @@ public class ProbeEditActionTest extends RhnBaseTestCase {
MonitoringTestUtils.setupParamValues(ah, probe.getCommand(), 3);
ActionForward af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbesListSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbesListSetupActionTest.java
index a435494..b35d137 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbesListSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbesListSetupActionTest.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.frontend.action.systems.monitoring.ProbesListSetupAction;
import com.redhat.rhn.frontend.dto.monitoring.ServerProbeDto;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
import com.redhat.rhn.testing.ActionHelper;
@@ -55,7 +56,7 @@ public class ProbesListSetupActionTest extends RhnBaseTestCase {
ah.getRequest().setupAddParameter("sid", server.getId().toString());
ah.setupClampListBounds();
ActionForward af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
DataResult dr = (DataResult) ah.getRequest().getAttribute(ListHelper.DATA_SET);
assertNotNull(dr);
assertTrue(dr.size() > 0);
@@ -85,7 +86,7 @@ public class ProbesListSetupActionTest extends RhnBaseTestCase {
ah.getRequest().setupAddParameter("sid", server.getId().toString());
ah.setupClampListBounds();
ActionForward af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
DataResult dr = (DataResult) ah.getRequest().getAttribute(ListHelper.DATA_SET);
assertTrue(dr.size() == 0);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListDeleteSubmitActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListDeleteSubmitActionTest.java
index e571898..351bcb7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListDeleteSubmitActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListDeleteSubmitActionTest.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.common.CommonFactory;
import com.redhat.rhn.domain.common.FileList;
import com.redhat.rhn.domain.common.test.FileListTest;
import com.redhat.rhn.frontend.action.systems.provisioning.PreservationListDeleteSubmitAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -78,7 +79,7 @@ public class PreservationListDeleteSubmitActionTest extends RhnBaseTestCase {
*/
public void testNothingSeleted() throws Exception {
ActionHelper ah = new ActionHelper();
- ah.setUpAction(action, "default");
+ ah.setUpAction(action, RhnHelper.DEFAULT_FORWARD);
ah.getRequest().setRequestURL("");
ah.getRequest().setupAddParameter("newset", (String)null);
ah.getRequest().setupAddParameter("items_on_page", (String)null);
@@ -86,7 +87,7 @@ public class PreservationListDeleteSubmitActionTest extends RhnBaseTestCase {
ah.setupClampListBounds();
ActionForward testforward = ah.executeAction("forwardToConfirm");
assertEquals("path?lower=10", testforward.getPath());
- assertEquals("default", testforward.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, testforward.getName());
}
}
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 ec0c640..9c9ed14 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
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.server.ServerFactory;
import com.redhat.rhn.frontend.action.systems.sdc.SystemDetailsEditAction;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.entitlement.EntitlementManager;
import com.redhat.rhn.manager.system.SystemManager;
import com.redhat.rhn.testing.ChannelTestUtils;
@@ -103,7 +104,7 @@ public class SystemDetailsEditActionTest extends RhnPostMockStrutsTestCase {
public void testBaseEntitlementListForEntitledSystem() throws Exception {
actionPerform();
- verifyForward("default");
+ verifyForward(RhnHelper.DEFAULT_FORWARD);
List options = (List) request
.getAttribute(SystemDetailsEditAction
.BASE_ENTITLEMENT_OPTIONS);
@@ -135,7 +136,7 @@ public class SystemDetailsEditActionTest extends RhnPostMockStrutsTestCase {
SystemManager.removeAllServerEntitlements(s.getId());
TestUtils.saveAndFlush(s);
actionPerform();
- verifyForward("default");
+ verifyForward(RhnHelper.DEFAULT_FORWARD);
List options = (List) request
.getAttribute(SystemDetailsEditAction
.BASE_ENTITLEMENT_OPTIONS);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchSetupActionTest.java
index 2d595f4..0eb5d43 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchSetupActionTest.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.server.test.ServerFactoryTest;
import com.redhat.rhn.frontend.action.systems.SystemSearchSetupAction;
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.testing.RhnMockStrutsTestCase;
import org.apache.struts.action.DynaActionForm;
@@ -68,7 +69,7 @@ public class SystemSearchSetupActionTest extends RhnMockStrutsTestCase {
addRequestParameter(SystemSearchSetupAction.VIEW_MODE,
"systemsearch_name_and_description");
actionPerform();
- verifyForward("default");
+ verifyForward(RhnHelper.DEFAULT_FORWARD);
DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST);
assertNotNull(dr);
assertFalse(dr.isEmpty());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/test/LoginSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/test/LoginSetupActionTest.java
index 88f98f8..92f314d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/test/LoginSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/test/LoginSetupActionTest.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.action.test;
import com.redhat.rhn.frontend.action.LoginSetupAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.satellite.test.CertificateManagerTest;
import com.redhat.rhn.testing.RhnMockDynaActionForm;
import com.redhat.rhn.testing.RhnMockHttpServletRequest;
@@ -60,7 +61,8 @@ public class LoginSetupActionTest extends RhnMockStrutsTestCase {
// setup stuff for Struts
ActionMapping mapping = new ActionMapping();
- mapping.addForwardConfig(new ActionForward("default", "path", false));
+ mapping.addForwardConfig(
+ new ActionForward(RhnHelper.DEFAULT_FORWARD, "path", false));
RhnMockDynaActionForm form = new RhnMockDynaActionForm("loginForm");
RhnMockHttpServletRequest req = new RhnMockHttpServletRequest();
RhnMockHttpServletResponse resp = new RhnMockHttpServletResponse();
@@ -77,6 +79,6 @@ public class LoginSetupActionTest extends RhnMockStrutsTestCase {
assertNotNull(bounce);
assertEquals(bounce, "/rhn/UserDetails.do?sid=1");
assertNotNull(rc);
- assertEquals("default", rc.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, rc.getName());
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/test/ChangeEmailSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/user/test/ChangeEmailSetupActionTest.java
index 43f9546..ff80da1 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/test/ChangeEmailSetupActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/test/ChangeEmailSetupActionTest.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.user.test;
import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.user.ChangeEmailSetupAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.user.UserManager;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -43,7 +44,7 @@ public class ChangeEmailSetupActionTest extends RhnBaseTestCase {
UserManager.storeUser(user);
ActionForward result = sah.executeAction();
- assertEquals("default", result.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, result.getName());
//If we are a satellite, then we should expect yourchangeemail.instructions
//and message.Update
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/test/DisableSelfConfirmActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/user/test/DisableSelfConfirmActionTest.java
index 23283ba..8444ce4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/test/DisableSelfConfirmActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/test/DisableSelfConfirmActionTest.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.user.test;
import com.redhat.rhn.domain.user.UserFactory;
import com.redhat.rhn.frontend.action.user.DisableSelfConfirmAction;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -33,9 +34,9 @@ public class DisableSelfConfirmActionTest extends RhnBaseTestCase {
ActionHelper ah = new ActionHelper();
ActionForward af;
- ah.setUpAction(action, "default");
+ ah.setUpAction(action, RhnHelper.DEFAULT_FORWARD);
af = ah.executeAction();
- assertEquals("default", af.getName());
+ assertEquals(RhnHelper.DEFAULT_FORWARD, af.getName());
//successfully disabled
ah.setUpAction(action, "logout");
diff --git a/java/code/src/com/redhat/rhn/frontend/struts/test/RhnListActionTest.java b/java/code/src/com/redhat/rhn/frontend/struts/test/RhnListActionTest.java
index d130c27..753c041 100644
--- a/java/code/src/com/redhat/rhn/frontend/struts/test/RhnListActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/struts/test/RhnListActionTest.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.testing.ActionHelper;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -72,8 +73,8 @@ public class RhnListActionTest extends RhnBaseTestCase {
}
clampListBounds(pc, request, user);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"),
- request.getParameterMap());
+ return getStrutsDelegate().forwardParams(mapping.findForward(
+ RhnHelper.DEFAULT_FORWARD), request.getParameterMap());
}
public PageControl getPageControl() {
diff --git a/java/code/src/com/redhat/rhn/frontend/struts/test/RhnUnpagedListActionTest.java b/java/code/src/com/redhat/rhn/frontend/struts/test/RhnUnpagedListActionTest.java
index 46e105c..2f77c80 100644
--- a/java/code/src/com/redhat/rhn/frontend/struts/test/RhnUnpagedListActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/struts/test/RhnUnpagedListActionTest.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.listview.ListControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnUnpagedListAction;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.testing.ActionHelper;
@@ -72,7 +73,8 @@ public class RhnUnpagedListActionTest extends RhnBaseTestCase {
}
filterList(lc, request, user);
- return strutsDelegate.forwardParams(mapping.findForward("default"),
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateTest.java b/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateTest.java
index 46803c4..2e577bd 100644
--- a/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/struts/test/StrutsDelegateTest.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.struts.test;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.testing.RhnMockDynaActionForm;
@@ -42,7 +43,7 @@ public class StrutsDelegateTest extends TestCase {
*
*/
public final void testForwardParams() {
- ActionForward success = new ActionForward("default", "path", false);
+ ActionForward success = new ActionForward(RhnHelper.DEFAULT_FORWARD, "path", false);
StrutsDelegate strutsDelegate = new StrutsDelegateStub();
diff --git a/java/code/src/com/redhat/rhn/testing/ActionHelper.java b/java/code/src/com/redhat/rhn/testing/ActionHelper.java
index cc5d4bb..9c28205 100644
--- a/java/code/src/com/redhat/rhn/testing/ActionHelper.java
+++ b/java/code/src/com/redhat/rhn/testing/ActionHelper.java
@@ -52,7 +52,7 @@ public class ActionHelper extends Assert {
* @throws Exception if error occurs setting up the Action.
*/
public void setUpAction(Action actionIn) throws Exception {
- setUpAction(actionIn, "default");
+ setUpAction(actionIn, RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/testing/BaseDeleteErrataActionAbstractTest.java b/java/code/src/com/redhat/rhn/testing/BaseDeleteErrataActionAbstractTest.java
index 3d8b9d8..f7b9700 100644
--- a/java/code/src/com/redhat/rhn/testing/BaseDeleteErrataActionAbstractTest.java
+++ b/java/code/src/com/redhat/rhn/testing/BaseDeleteErrataActionAbstractTest.java
@@ -68,7 +68,7 @@ public abstract class BaseDeleteErrataActionAbstractTest extends RhnMockStrutsTe
// assertEquals(5, set.size());
//
// actionPerform();
-// verifyForward("default");
+// verifyForward(RhnHelper.DEFAULT_FORWARD);
//
// set = RhnSetDecl.ERRATA_TO_DELETE.get(user);
//
commit f28766fa807097bdd44651326e8b556e5b375ed3
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jun 1 17:25:08 2012 +0200
Refactor "default" to RhnHelper.DEFAULT_FORWARD
Do not use literal when there is a final static available.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/BaseEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/BaseEditAction.java
index 9a42cba..bbcb1f4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/BaseEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/BaseEditAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action;
import com.redhat.rhn.common.validator.ValidatorError;
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.struts.RhnValidationHelper;
import com.redhat.rhn.manager.PersistOperation;
@@ -44,7 +45,7 @@ public abstract class BaseEditAction extends RhnAction {
HttpServletResponse response) {
DynaActionForm form = (DynaActionForm) formIn;
- ActionForward retval = mapping.findForward("default");
+ ActionForward retval = mapping.findForward(RhnHelper.DEFAULT_FORWARD);
PersistOperation opr = getCommand(new RequestContext(request));
RequestContext rctx = new RequestContext(request);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/GenericIndexAction.java b/java/code/src/com/redhat/rhn/frontend/action/GenericIndexAction.java
index 5bd2524..56cf461 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/GenericIndexAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/GenericIndexAction.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.action;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -40,6 +41,6 @@ public class GenericIndexAction extends RhnAction {
RequestContext requestContext = new RequestContext(request);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java
index c587a54..b3d1354 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/LoginSetupAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.db.datasource.ModeFactory;
import com.redhat.rhn.common.db.datasource.SelectMode;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.acl.AclManager;
import com.redhat.rhn.manager.satellite.CertificateManager;
import com.redhat.rhn.manager.satellite.SystemCommandExecutor;
@@ -80,7 +81,7 @@ public class LoginSetupAction extends RhnAction {
if (man.isSatelliteCertExpired()) {
addMessage(request, "satellite.expired");
request.setAttribute(HAS_EXPIRED, Boolean.TRUE);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
else if (man.isSatelliteCertInGracePeriod()) {
long daysUntilExpiration = man.getDaysLeftBeforeCertExpiration();
@@ -120,7 +121,7 @@ public class LoginSetupAction extends RhnAction {
f.set("request_method", requestMethod);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
private String getRpmSchemaVersion(String schemaName) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java
index bbb0b47..db8997e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.frontend.action.errata.ErrataSearchAction;
import com.redhat.rhn.frontend.action.systems.SystemSearchSetupAction;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -61,7 +62,7 @@ public class SearchAction extends RhnAction {
String searchType = daForm.getString("search_type");
if (searchType == null) {
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
else if (searchType.equals("systems") &&
(user.getOrg().getEntitlements().contains(
diff --git a/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java b/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java
index 0176459..f5ba331 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java
@@ -30,6 +30,7 @@ import com.redhat.rhn.frontend.action.renderers.WarningProbesRenderer;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -121,7 +122,7 @@ public class YourRhnAction extends RhnAction {
}
request.setAttribute(ANY_LISTS_SELECTED, Boolean.valueOf(anyListsSelected));
request.setAttribute("legends", "yourrhn");
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
private String formatKey(String key) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/AuditAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/AuditAction.java
index 0e3679f..050ab41 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/audit/AuditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/audit/AuditAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.audit;
import com.redhat.rhn.common.db.datasource.DataResult;
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.ListTagHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -61,7 +62,7 @@ public class AuditAction extends RhnAction implements Listable {
}
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
forwardParams);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/AuditMachineAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/AuditMachineAction.java
index c096820..2b1ed56 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/audit/AuditMachineAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/audit/AuditMachineAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.audit;
import com.redhat.rhn.common.db.datasource.DataResult;
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.ListTagHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -102,7 +103,7 @@ public class AuditMachineAction extends RhnAction implements Listable {
request.setAttribute("machine", machine);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
forwardParams);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java
index 6d96ae6..61bc7bb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.frontend.action.common.DateRangePicker;
import com.redhat.rhn.frontend.dto.AuditReviewDto;
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.ListTagHelper;
import com.redhat.rhn.manager.audit.AuditManager;
@@ -213,7 +214,7 @@ public class AuditSearchAction extends RhnAction {
// we skip the search dialog and return the default selection
submitted = true;
typemap = AuditManager.getAuditTypeMap();
- autypes = typemap.get("default");
+ autypes = typemap.get(RhnHelper.DEFAULT_FORWARD);
}
amsgs = new ActionMessages();
@@ -300,7 +301,7 @@ public class AuditSearchAction extends RhnAction {
}
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
forwardParams);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/BaseChannelTreeAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/BaseChannelTreeAction.java
index 44bab69..ac4e25e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/BaseChannelTreeAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/BaseChannelTreeAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.frontend.dto.ChannelTreeNode;
import com.redhat.rhn.frontend.filter.TreeFilter;
import com.redhat.rhn.frontend.listview.ListControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnUnpagedListAction;
import org.apache.struts.action.ActionForm;
@@ -63,7 +64,7 @@ public abstract class BaseChannelTreeAction extends RhnUnpagedListAction {
request.setAttribute("pageList", dr);
request.setAttribute("satAdmin", user.hasRole(RoleFactory.SAT_ADMIN));
addAttributes(requestContext);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
protected abstract DataResult getDataResult(RequestContext requestContext,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.java
index 8fda6a5..8733dc1 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
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.manager.channel.ChannelManager;
import com.redhat.rhn.manager.system.SystemManager;
import com.redhat.rhn.manager.user.UserManager;
@@ -51,7 +52,7 @@ public class ChannelDetailsAction extends RhnAction {
RequestContext ctx = new RequestContext(request);
User user = ctx.getLoggedInUser();
Map params = makeParamMap(request);
- String fwd = "default";
+ String fwd = RhnHelper.DEFAULT_FORWARD;
long cid = ctx.getRequiredParam("cid");
Channel chan = ChannelManager.lookupByIdAndUser(cid, user);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelEntitlementSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelEntitlementSetupAction.java
index 286e411..56cd3d7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelEntitlementSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelEntitlementSetupAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.channel.ChannelFamilyFactory;
import com.redhat.rhn.frontend.dto.ChannelOverview;
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.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.channel.ChannelManager;
@@ -51,7 +52,7 @@ public class ChannelEntitlementSetupAction extends RhnAction implements Listable
ListHelper helper = new ListHelper(this, request);
helper.execute();
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelErrataAction.java
index ec27025..5db933d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelErrataAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.channel.ChannelFactory;
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.ListTagHelper;
import com.redhat.rhn.manager.errata.ErrataManager;
@@ -56,7 +57,7 @@ public class ChannelErrataAction extends RhnAction {
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
request.setAttribute("pageList", ErrataManager.errataInChannel(cid));
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelFamilyTreeAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelFamilyTreeAction.java
index 39759b8..3ad89ae 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelFamilyTreeAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelFamilyTreeAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.frontend.dto.ChannelOverview;
import com.redhat.rhn.frontend.dto.ChannelTreeNode;
import com.redhat.rhn.frontend.listview.ListControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.channel.ChannelManager;
import org.apache.struts.action.ActionForm;
@@ -61,7 +62,7 @@ public class ChannelFamilyTreeAction extends BaseChannelTreeAction {
request.setAttribute("cfid", cfid);
request.setAttribute("familyName", co.getName());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
@Override
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelPackagesAction.java
index 62574a4..d0b5a4f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelPackagesAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.BadParameterException;
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.ListTagHelper;
import com.redhat.rhn.manager.rhnpackage.PackageManager;
@@ -61,7 +62,7 @@ public class ChannelPackagesAction extends RhnAction {
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
request.setAttribute("pageList", PackageManager.listPackagesInChannelForList(cid));
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelSubscribedAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelSubscribedAction.java
index f875127..5b88f89 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelSubscribedAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ChannelSubscribedAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
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.struts.RhnListSetHelper;
import com.redhat.rhn.frontend.taglibs.list.AlphaBarHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
@@ -89,7 +90,7 @@ public class ChannelSubscribedAction extends RhnAction {
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverviewAction.java
index d90b9f9..7b14d4d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverviewAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverviewAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.channel;
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.ListTagHelper;
import com.redhat.rhn.manager.rhnpackage.PackageManager;
@@ -78,6 +79,6 @@ public class PackageNameOverviewAction extends RhnAction {
request.setAttribute("pageList", dr);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java
index b4a0ea8..74beb1a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.frontend.dto.PackageDto;
import com.redhat.rhn.frontend.dto.PackageOverview;
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.ListTagHelper;
import com.redhat.rhn.frontend.xmlrpc.SearchServerIndexException;
import com.redhat.rhn.manager.channel.ChannelManager;
@@ -84,7 +85,7 @@ public class PackageSearchAction extends RhnAction {
if (!isSubmitted(form)) {
setupForm(request, form);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
}
@@ -148,7 +149,7 @@ public class PackageSearchAction extends RhnAction {
if (!errors.isEmpty()) {
addErrors(request, errors);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
forwardParams);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsAction.java
index f7e0b56..77d21da 100755
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.channel.Channel;
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.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.channel.ChannelManager;
@@ -70,7 +71,7 @@ public class TargetSystemsAction extends RhnAction implements Listable {
params);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsConfirmAction.java
index e5a5420..48fef7d 100755
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsConfirmAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.server.Server;
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.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.channel.ChannelManager;
@@ -95,7 +96,7 @@ public class TargetSystemsConfirmAction extends RhnAction implements Listable {
return getStrutsDelegate().forwardParams(mapping.findForward("success"),
params);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java
index 8e7f701..b49c9ed 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.channel.SelectableChannel;
import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.frontend.struts.RhnListSetHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
@@ -184,7 +185,7 @@ public class AddCustomErrataAction extends RhnListAction {
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddErrataAction.java
index c6dbefc..7560e98 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddErrataAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import org.apache.struts.action.ActionForm;
@@ -56,7 +57,7 @@ public class AddErrataAction extends RhnListAction {
request.setAttribute("channel_name", currentChan.getName());
request.setAttribute("cid", cid);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
index b8df56c..5893b90 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.channel.SelectableChannelVersion;
import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.frontend.struts.RhnListSetHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
@@ -228,7 +229,7 @@ public class AddRedHatErrataAction extends RhnListAction {
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
index d7dc027..1f97b4d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
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.xmlrpc.PermissionCheckFailureException;
import com.redhat.rhn.manager.user.UserManager;
@@ -57,6 +58,6 @@ public class ChannelPackageMenuAction extends RhnAction {
request.setAttribute("channel", chan);
request.setAttribute("cid", cid);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAction.java
index 0d12d22..0844da4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAction.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
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.struts.RhnListSetHelper;
import com.redhat.rhn.frontend.taglibs.list.AlphaBarHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
@@ -112,7 +113,7 @@ public class ChannelPackagesAction extends RhnAction {
params);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java
index abc21e7..5919596 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java
@@ -26,6 +26,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
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.struts.RhnListSetHelper;
import com.redhat.rhn.frontend.taglibs.list.AlphaBarHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
@@ -179,7 +180,7 @@ public class ChannelPackagesAddAction extends RhnAction {
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
request.setAttribute("pageList", result);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddConfirmAction.java
index f98206a..c5c1b77 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddConfirmAction.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
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.ListTagHelper;
import com.redhat.rhn.frontend.taglibs.list.TagHelper;
import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException;
@@ -113,7 +114,7 @@ public class ChannelPackagesAddConfirmAction extends RhnAction {
params);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesRemoveAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesRemoveAction.java
index f9216b5..89c1a99 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesRemoveAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesRemoveAction.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
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.ListTagHelper;
import com.redhat.rhn.frontend.taglibs.list.TagHelper;
import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException;
@@ -104,7 +105,7 @@ public class ChannelPackagesRemoveAction extends RhnAction {
params);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java
index f04ef22..3bcef15 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.ErrataOverview;
import com.redhat.rhn.frontend.dto.PackageOverview;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
import com.redhat.rhn.manager.errata.ErrataManager;
@@ -164,7 +165,7 @@ public class ConfirmErrataAction extends RhnListAction {
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java
index 7421340..587f834 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.channel.Channel;
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.manager.channel.ChannelManager;
import com.redhat.rhn.manager.system.SystemManager;
@@ -79,19 +80,19 @@ public class DeleteChannelAction extends RhnAction {
}
catch (PermissionException e) {
addMessage(request, e.getMessage());
- return actionMapping.findForward("default");
+ return actionMapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
catch (ValidatorException ve) {
getStrutsDelegate().saveMessages(request, ve.getResult());
request.setAttribute(DISABLE_DELETE, Boolean.TRUE);
- return actionMapping.findForward("default");
+ return actionMapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
createSuccessMessage(request, "message.channeldeleted", channel.getName());
return actionMapping.findForward("success");
}
addMessage(request, "message.channel.delete.systemssubscribed");
- return actionMapping.findForward("default");
+ return actionMapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
else if (channel.containsDistributions()) {
createErrorMessage(request,
@@ -99,6 +100,6 @@ public class DeleteChannelAction extends RhnAction {
request.setAttribute(DISABLE_DELETE, Boolean.TRUE);
}
- return actionMapping.findForward("default");
+ return actionMapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index 2eda003..24af8f7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -29,6 +29,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.OrgTrust;
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.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.frontend.xmlrpc.InvalidChannelLabelException;
@@ -88,7 +89,7 @@ public class EditChannelAction extends RhnAction implements Listable {
if (!isSubmitted(form)) {
setupForm(request, form);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
@@ -165,7 +166,7 @@ public class EditChannelAction extends RhnAction implements Listable {
addErrors(request, errors);
prepDropdowns(new RequestContext(request));
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
params);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataIndexAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataIndexAction.java
index 68a4b92..7e2966c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataIndexAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataIndexAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import org.apache.struts.action.ActionForm;
@@ -56,7 +57,7 @@ public class ErrataIndexAction extends RhnListAction {
request.setAttribute("channel_name", currentChan.getName());
request.setAttribute("cid", cid);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataRemoveAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataRemoveAction.java
index 5182776..29ccbe1 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataRemoveAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataRemoveAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.frontend.taglibs.list.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -103,7 +104,7 @@ public class ErrataRemoveAction extends RhnListAction implements Listable {
return getStrutsDelegate().forwardParams(mapping.findForward("submit"),
params);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ListErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ListErrataAction.java
index ab48ae1..fe63c28 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ListErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ListErrataAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.frontend.taglibs.list.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -90,7 +91,7 @@ public class ListErrataAction extends RhnListAction implements Listable {
request.setAttribute("cid", cid);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ManageChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ManageChannelsAction.java
index 38feca8..69b26dd 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ManageChannelsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ManageChannelsAction.java
@@ -18,6 +18,7 @@ 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.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.channel.ChannelManager;
@@ -46,7 +47,7 @@ public class ManageChannelsAction extends RhnAction implements Listable {
ListHelper helper = new ListHelper(this, request);
helper.execute();
- return actionMapping.findForward("default");
+ return actionMapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/** {@inheritDoc} */
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PatchSetListAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PatchSetListAction.java
index 251effb..dfe7f0d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PatchSetListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PatchSetListAction.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.PatchSetOverview;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.frontend.struts.RhnListSetHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
@@ -130,7 +131,7 @@ public class PatchSetListAction extends RhnListAction {
ListTagHelper.bindSetDeclTo(LIST_NAME, getDecl(), request);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataAction.java
index 7a24554..f504bad 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.channel.ChannelManager;
import com.redhat.rhn.manager.errata.ErrataManager;
@@ -110,7 +111,7 @@ public class PublishErrataAction extends RhnListAction {
getStrutsDelegate().saveMessages(requestContext.getRequest(), msg);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java
index 18a6056..aa85f7d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java
@@ -33,6 +33,7 @@ import com.redhat.rhn.domain.channel.ContentSource;
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.struts.StrutsDelegate;
import com.redhat.rhn.frontend.taglibs.list.helper.ListSessionSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -102,7 +103,7 @@ public class RepositoriesAction extends RhnAction implements Listable {
(mapping.findForward("success"), params);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataAction.java
index d695a96..d9c8cf5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.channel.InvalidChannelRoleException;
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.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.channel.ChannelManager;
@@ -61,7 +62,7 @@ public class SyncErrataAction extends RhnAction implements Listable {
}
catch (InvalidChannelRoleException e) {
addMessage(request, e.getMessage());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
ListRhnSetHelper helper = new ListRhnSetHelper(this, request,
@@ -77,7 +78,7 @@ public class SyncErrataAction extends RhnAction implements Listable {
request.setAttribute("channel_name", chan.getName());
request.setAttribute(RequestContext.CID, chan.getId());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataPackagesAction.java
index 515fe20..5ac6764 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataPackagesAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.errata.impl.PublishedClonedErrata;
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.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.channel.ChannelEditor;
@@ -74,7 +75,7 @@ public class SyncErrataPackagesAction extends RhnAction implements Listable {
}
catch (InvalidChannelRoleException e) {
addMessage(request, e.getMessage());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
RhnSetDecl pkgDecl = RhnSetDecl.ERRATA_PACKAGES_TO_SYNC.createCustom(chan.getId());
@@ -109,7 +110,7 @@ public class SyncErrataPackagesAction extends RhnAction implements Listable {
request.setAttribute("channel_name", chan.getName());
request.setAttribute(RequestContext.CID, chan.getId());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java
index d5c8652..d101190 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.channel.ContentSource;
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.struts.StrutsDelegate;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -83,7 +84,7 @@ public class SyncRepositoriesAction extends RhnAction implements Listable {
request.setAttribute("inactive", true);
createErrorMessage(request,
"repos.jsp.message.taskomaticdown", null);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
@@ -102,7 +103,7 @@ public class SyncRepositoriesAction extends RhnAction implements Listable {
if (!UserManager.verifyChannelAdmin(user, chan)) {
createErrorMessage(request,
"frontend.actions.channels.manager.add.permsfailure", null);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
@@ -137,7 +138,7 @@ public class SyncRepositoriesAction extends RhnAction implements Listable {
createErrorMessage(request,
"repos.jsp.message.schedulefailed", null);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
Map forwardParams = new HashMap();
@@ -146,7 +147,7 @@ public class SyncRepositoriesAction extends RhnAction implements Listable {
forwardParams);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
index fa274a5..0421dd2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
@@ -84,7 +84,7 @@ public class RepoDetailsAction extends RhnAction {
if (!errors.isEmpty()) {
addErrors(request, errors);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
new HashMap());
}
if (isCreateMode(request)) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoListSetupAction.java
index 134f723..7db5712 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoListSetupAction.java
@@ -29,6 +29,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.ContentSourceDto;
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.ListTagHelper;
import com.redhat.rhn.manager.channel.RepoLister;
@@ -55,7 +56,7 @@ public class RepoListSetupAction extends RhnAction {
Collections.sort(result, LABEL_COMPARATOR);
request.setAttribute("pageList", result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java b/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java
index b29a207..f71981c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.rhnset.RhnSetElement;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
@@ -139,7 +140,8 @@ public abstract class BaseSetOperateOnDiffAction extends RhnSetAction {
generateUserMessage(added, removed, request);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(mapping.findForward(
+ RhnHelper.DEFAULT_FORWARD), params);
}
protected void generateUserMessage(List added, List removed,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java
index 43ac013..4da04b5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.config.ConfigFile;
import com.redhat.rhn.domain.config.ConfigRevision;
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.struts.RhnValidationHelper;
import com.redhat.rhn.manager.configuration.ConfigFileBuilder;
@@ -70,7 +71,7 @@ public abstract class BaseAddFilesAction extends RhnAction {
cff.setDefaults();
}
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"), params);
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
/**
@@ -137,7 +138,7 @@ public abstract class BaseAddFilesAction extends RhnAction {
}
// If we got here, something went wrong - try again
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"), params);
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
protected abstract ConfigChannel getConfigChannel(HttpServletRequest request);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/BaseCopyToAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/BaseCopyToAction.java
index 81f1c14..0d4b8a3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/BaseCopyToAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/BaseCopyToAction.java
@@ -99,7 +99,7 @@ public abstract class BaseCopyToAction extends RhnAction {
helper.syncSelections(destSet, result);
ListTagHelper.setSelectedAmount(getJspLabel(), destSet.size(), req);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
protected void setupRequest(HttpServletRequest req) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelDeployConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelDeployConfirmAction.java
index 21951a8..d70bef4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelDeployConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelDeployConfirmAction.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.configuration.ConfigActionHelper;
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.ListTagHelper;
import com.redhat.rhn.manager.configuration.ConfigurationManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -73,7 +74,7 @@ public class ChannelDeployConfirmAction extends RhnAction {
}
return prepareToLeave(mapping, request, cc, dForm, "failure");
}
- return prepareToLeave(mapping, request, cc, dForm, "default");
+ return prepareToLeave(mapping, request, cc, dForm, RhnHelper.DEFAULT_FORWARD);
}
private ActionForward prepareToLeave(ActionMapping mapping, HttpServletRequest req,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelOverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelOverviewAction.java
index 936f58c..c5e77b9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelOverviewAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelOverviewAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.configuration.ConfigActionHelper;
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.struts.RhnValidationHelper;
import com.redhat.rhn.manager.configuration.ChannelSummary;
import com.redhat.rhn.manager.configuration.ConfigChannelCreationHelper;
@@ -102,13 +103,14 @@ public class ChannelOverviewAction extends RhnAction {
else {
setupForm(request, cc, daForm, params);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"), params);
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
}
}
// No channel - proabably creating a new one
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelOverviewTasks.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelOverviewTasks.java
index 8b65481..71a423d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelOverviewTasks.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelOverviewTasks.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.frontend.dto.ConfigFileDto;
import com.redhat.rhn.frontend.dto.ConfigSystemDto;
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.struts.RhnSetHelper;
import com.redhat.rhn.manager.action.ActionManager;
import com.redhat.rhn.manager.configuration.ConfigurationManager;
@@ -59,7 +60,6 @@ public class ChannelOverviewTasks extends RhnAction {
public static final String SEL_FILES_TO_ALL_SYS = "sel2all";
public static final String SEL_FILES_TO_SEL_SYS = "sel2sel";
public static final String COMPARE = "compare";
- public static final String DEFAULT = "default";
/**
* {@inheritDoc}
@@ -105,7 +105,7 @@ public class ChannelOverviewTasks extends RhnAction {
else {
createErrorMessage(req, "deploytask.error.badmode", null);
return getStrutsDelegate().forwardParams(
- map.findForward(DEFAULT), params);
+ map.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/DeleteChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/DeleteChannelAction.java
index 4ba5cd1..49f985e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/DeleteChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/DeleteChannelAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.configuration.ConfigActionHelper;
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.configuration.ConfigurationManager;
import org.apache.struts.action.ActionForm;
@@ -64,7 +65,8 @@ public class DeleteChannelAction extends RhnAction {
ConfigActionHelper.setupRequestAttributes(rctx, cc);
}
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
private void deleteChannel(HttpServletRequest request, ConfigChannel cc) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteFileAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteFileAction.java
index 4ba19f1..98bedf7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteFileAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteFileAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.frontend.action.configuration.ConfigActionHelper;
import com.redhat.rhn.frontend.action.configuration.ConfigFileForm;
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.configuration.ConfigurationManager;
import org.apache.struts.action.ActionForm;
@@ -77,7 +78,7 @@ public class DeleteFileAction extends RhnAction {
req.setAttribute("deleting", Boolean.TRUE);
return getStrutsDelegate().forwardParams(
- map.findForward("default"), params);
+ map.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
catch (IllegalArgumentException e) {
//Log the error and go on with life.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteRevisionAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteRevisionAction.java
index cb8445f..b1b6c33 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteRevisionAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteRevisionAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.frontend.action.configuration.ConfigActionHelper;
import com.redhat.rhn.frontend.action.configuration.ConfigFileForm;
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.configuration.ConfigurationManager;
import org.apache.struts.action.ActionForm;
@@ -92,12 +93,12 @@ public class DeleteRevisionAction extends RhnAction {
cff.updateFromRevision(request, cr);
request.setAttribute("deleting", Boolean.TRUE);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"), params);
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
ActionMessage am = new ActionMessage("deleterev.jsp.unknown");
msgs.add(ActionMessages.GLOBAL_MESSAGE, am);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"), params);
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
finally {
if (!msgs.isEmpty()) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java
index 074195b..07dbe9d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.frontend.action.configuration.ConfigActionHelper;
import com.redhat.rhn.frontend.action.configuration.ConfigFileForm;
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.struts.RhnValidationHelper;
import com.redhat.rhn.manager.configuration.ConfigFileBuilder;
import com.redhat.rhn.manager.configuration.ConfigurationManager;
@@ -95,7 +96,8 @@ public class FileDetailsAction extends RhnAction {
request.setAttribute("form", cff);
request.setAttribute("documentation", ConfigDefaults.get().isDocAvailable());
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
protected void setupRequestParams(RequestContext ctx, ConfigRevision cr) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/LocalRevisionDeployAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/LocalRevisionDeployAction.java
index 569c6fd..6df09f2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/LocalRevisionDeployAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/LocalRevisionDeployAction.java
@@ -27,6 +27,7 @@ import com.redhat.rhn.frontend.action.configuration.ConfigActionHelper;
import com.redhat.rhn.frontend.dto.ConfigSystemDto;
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.configuration.ConfigurationManager;
import org.apache.struts.action.ActionForm;
@@ -92,7 +93,8 @@ public class LocalRevisionDeployAction extends RhnAction {
DatePicker.YEAR_RANGE_POSITIVE);
request.setAttribute("date", d);
ConfigActionHelper.setupRequestAttributes(requestContext, cr.getConfigFile(), cr);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
protected Server findServer(HttpServletRequest request, ConfigRevision cr) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSubmit.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSubmit.java
index 7260a1c..bf47fe7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSubmit.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSubmit.java
@@ -155,7 +155,8 @@ public class ManageRevisionSubmit extends RhnSetAction {
ValidatorResult result = cff.validateUpload(request);
if (!result.isEmpty()) {
getStrutsDelegate().saveMessages(request, result);
- return getStrutsDelegate().forwardParam(mapping.findForward("default"),
+ return getStrutsDelegate().forwardParam(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
ConfigActionHelper.FILE_ID, cfid.toString());
}
@@ -167,7 +168,8 @@ public class ManageRevisionSubmit extends RhnSetAction {
//create the success message
createUploadSuccessMessage(rev, request, cfid);
- return getStrutsDelegate().forwardParam(mapping.findForward("default"),
+ return getStrutsDelegate().forwardParam(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
ConfigActionHelper.FILE_ID, cfid.toString());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/GlobalConfigChannelList.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/GlobalConfigChannelList.java
index 6009f1d..9d69efa 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/GlobalConfigChannelList.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/GlobalConfigChannelList.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.configuration.ConfigurationManager;
@@ -52,8 +53,8 @@ public class GlobalConfigChannelList extends RhnListAction {
clampListBounds(pc, request, user);
request.setAttribute("pageList", getDataResult(user, pc));
- return getStrutsDelegate().forwardParams(mapping.findForward("default"),
- request.getParameterMap());
+ return getStrutsDelegate().forwardParams(mapping.findForward(
+ RhnHelper.DEFAULT_FORWARD), request.getParameterMap());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/ManagedSystemsList.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/ManagedSystemsList.java
index e635a0a..0d594aa 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/ManagedSystemsList.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/ManagedSystemsList.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.configuration.ConfigurationManager;
@@ -51,8 +52,8 @@ public class ManagedSystemsList extends RhnListAction {
clampListBounds(pc, request, user);
request.setAttribute("pageList", getDataResult(user, pc));
- return getStrutsDelegate().forwardParams(mapping.findForward("default"),
- request.getParameterMap());
+ return getStrutsDelegate().forwardParams(mapping.findForward(
+ RhnHelper.DEFAULT_FORWARD), request.getParameterMap());
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/Overview.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/Overview.java
index 95b8f79..faa5a43 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/Overview.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/Overview.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.configuration.overview;
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.manager.acl.AclManager;
import com.redhat.rhn.manager.configuration.ConfigurationManager;
@@ -59,8 +60,8 @@ public class Overview extends RhnAction {
request.setAttribute("recentActions", manager.getRecentConfigDeployActions(user,
new Integer(5))); //display five recent actions.
- return getStrutsDelegate().forwardParams(mapping.findForward("default"),
- request.getParameterMap());
+ return getStrutsDelegate().forwardParams(mapping.findForward(
+ RhnHelper.DEFAULT_FORWARD), request.getParameterMap());
}
}
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 7acfa4b..3c5ced2 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
@@ -29,6 +29,7 @@ import com.redhat.rhn.frontend.action.configuration.ConfigActionHelper;
import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper;
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.action.ActionManager;
import com.redhat.rhn.manager.configuration.ConfigurationManager;
@@ -143,7 +144,7 @@ public class OverviewAction extends RhnAction {
setupConfigEnablementInfo(context);
setupLastDiffInfo(context);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ViewDiffResultAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ViewDiffResultAction.java
index 35be84b..3c98f1e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ViewDiffResultAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ViewDiffResultAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.action.ActionFactory;
import com.redhat.rhn.domain.action.config.ConfigRevisionAction;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -45,7 +46,7 @@ public class ViewDiffResultAction extends RhnAction {
ConfigRevisionAction action = ActionFactory.lookupConfigRevisionAction(acrid);
request.setAttribute(REVISION_BEAN, action);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsAction.java
index 4d582a8..cbfd7a3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.RhnSetAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.errata.ErrataManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -65,7 +66,8 @@ public class AffectedSystemsAction extends RhnSetAction {
new ActionMessage("affectedsystems.applynone"));
params = makeParamMap(formIn, request);
strutsDelegate.saveMessages(request, msg);
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
//if they chose systems, send them to the confirmation page
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsSetupAction.java
index b97ee50..7038250 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsSetupAction.java
@@ -99,7 +99,7 @@ public class AffectedSystemsSetupAction extends RhnListAction {
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI() + "?" +
RequestContext.ERRATA_ID + "=" + errata.getId());
- return strutsDelegate.forwardParams(mapping.findForward("default"),
+ return strutsDelegate.forwardParams(mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/BaseDeleteErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/BaseDeleteErrataAction.java
index b68476d..3a41048 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/BaseDeleteErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/BaseDeleteErrataAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
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.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
@@ -58,7 +59,7 @@ public abstract class BaseDeleteErrataAction extends RhnAction {
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/BaseErrataListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/BaseErrataListSetupAction.java
index a1b0169..bf90c6c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/BaseErrataListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/BaseErrataListSetupAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import org.apache.struts.action.ActionForm;
@@ -48,7 +49,7 @@ public abstract class BaseErrataListSetupAction extends RhnListAction {
DataResult dr = getDataResult(user, pc);
request.setAttribute("pageList", dr);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
protected abstract DataResult getDataResult(User user, PageControl pc);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/BaseErrataSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/BaseErrataSetupAction.java
index 58c2b4b..69a362c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/BaseErrataSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/BaseErrataSetupAction.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.action.errata;
import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import org.apache.struts.action.ActionForm;
@@ -45,7 +46,7 @@ public class BaseErrataSetupAction extends RhnListAction {
request.setAttribute("advisory", errata.getAdvisory());
//default forward
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ChannelSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ChannelSetupAction.java
index a6c4f3f..8f26a84 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ChannelSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ChannelSetupAction.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.ChannelOverview;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.channel.ChannelManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -151,7 +152,7 @@ public class ChannelSetupAction extends RhnListAction {
request.setAttribute("advisory", e.getAdvisory());
// forward to page
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
private boolean errataInChannel(Errata e, Long id) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/CloneConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/CloneConfirmAction.java
index 1ff64c7..2ae1347 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/CloneConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/CloneConfirmAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.ErrataOverview;
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.errata.ErrataManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
@@ -58,7 +59,7 @@ public class CloneConfirmAction extends RhnAction {
set.clear();
RhnSetManager.store(set);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/CloneErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/CloneErrataAction.java
index 358c760..cbc1f3d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/CloneErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/CloneErrataAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.channel.Channel;
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.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.channel.ChannelManager;
@@ -68,7 +69,7 @@ public class CloneErrataAction extends RhnAction implements Listable {
RequestContext context = new RequestContext(request);
populateChannelDropDown(context);
- forward = actionMapping.findForward("default");
+ forward = actionMapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
return forward;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/CreateSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/CreateSetupAction.java
index 4cc336e..bf10602 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/CreateSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/CreateSetupAction.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.action.errata;
import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.errata.ErrataManager;
import org.apache.commons.lang.StringUtils;
@@ -54,6 +55,6 @@ public class CreateSetupAction extends RhnAction {
//set l10n-ed advisoryTypeLabels list for select drop down
form.set("advisoryTypeLabels", ErrataManager.advisoryTypeLabels());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteBugAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteBugAction.java
index 2754ff8..9b4ffa6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteBugAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteBugAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.errata;
import com.redhat.rhn.domain.errata.Errata;
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.errata.ErrataManager;
import org.apache.struts.action.ActionForm;
@@ -56,7 +57,8 @@ public class DeleteBugAction extends RhnAction {
bid.toString(), errata.getAdvisory()));
saveMessages(request, msgs);
- return getStrutsDelegate().forwardParam(mapping.findForward("default"),
- "eid", errata.getId().toString());
+ return getStrutsDelegate().forwardParam(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
+ "eid", errata.getId().toString());
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java
index e424e20..43903b6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.action.errata;
import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.errata.ErrataManager;
@@ -59,7 +60,8 @@ public class DeleteErratumAction extends LookupDispatchAction {
Errata errata = requestContext.lookupErratum();
request.setAttribute("errata", errata);
- return getStrutsDelegate().forwardParam(mapping.findForward("default"),
+ return getStrutsDelegate().forwardParam(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
"eid", errata.getId().toString());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java
index a466655..94c15c9 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java
@@ -26,6 +26,7 @@ import com.redhat.rhn.domain.errata.ErrataFactory;
import com.redhat.rhn.domain.errata.Keyword;
import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.errata.ErrataManager;
@@ -129,7 +130,7 @@ public class EditAction extends LookupDispatchAction {
//set advisoryTypes list for select drop down
request.setAttribute("advisoryTypes", ErrataManager.advisoryTypes());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmAction.java
index de234b9..610224c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.SetLabels;
import com.redhat.rhn.frontend.dto.SystemOverview;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListDispatchAction;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.action.ActionManager;
@@ -126,7 +127,8 @@ public class ErrataConfirmAction extends RhnListDispatchAction {
new ActionMessage("errataconfirm.nosystems"));
strutsDelegate.saveMessages(request, msg);
Map params = makeParamMap(formIn, request);
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmSetupAction.java
index f8a4c8f..d765c05 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmSetupAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.SetLabels;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.errata.ErrataManager;
@@ -62,6 +63,6 @@ public class ErrataConfirmSetupAction extends RhnListAction {
request.setAttribute("pageList", dr);
request.setAttribute("errata", errata);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataDetailsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataDetailsSetupAction.java
index 07836dd..1967e98 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataDetailsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataDetailsSetupAction.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.errata.ErrataFile;
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.manager.errata.ErrataManager;
import org.apache.struts.action.ActionForm;
@@ -84,8 +85,9 @@ public class ErrataDetailsSetupAction extends RhnAction {
request.setAttribute("ovalFile", ovalFile);
request.setAttribute("errataFrom", errata.getErrataFrom());
- return getStrutsDelegate().forwardParams(mapping.findForward("default"),
- request.getParameterMap());
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
+ request.getParameterMap());
}
private String findOvalFile(Long errataId) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataListBaseAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataListBaseAction.java
index 36e159d..bd7aa24 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataListBaseAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataListBaseAction.java
@@ -18,6 +18,7 @@ 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.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.errata.ErrataManager;
@@ -56,7 +57,7 @@ public abstract class ErrataListBaseAction extends RhnAction implements Listable
ListHelper helper = new ListHelper(this, request);
helper.execute();
- return actionMapping.findForward("default");
+ return actionMapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/** {@inheritDoc} */
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataPackagesSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataPackagesSetupAction.java
index 5d1d20d..5ecc049 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataPackagesSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataPackagesSetupAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.ChannelOverview;
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.struts.StrutsDelegate;
import com.redhat.rhn.manager.channel.ChannelManager;
import com.redhat.rhn.manager.user.UserManager;
@@ -69,7 +70,7 @@ public class ErrataPackagesSetupAction extends RhnAction {
request.setAttribute("errata", errata);
request.setAttribute("channels", chans);
- return strutsDelegate.forwardParams(mapping.findForward("default"),
+ return strutsDelegate.forwardParams(mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
index 2c3b7b9..ed7ddbb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
@@ -25,6 +25,7 @@ import com.redhat.rhn.frontend.action.common.DateRangePicker.DatePickerResults;
import com.redhat.rhn.frontend.dto.ErrataOverview;
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.ListTagHelper;
import com.redhat.rhn.manager.errata.ErrataManager;
@@ -89,7 +90,7 @@ public class ErrataSearchAction extends RhnAction {
if (!isSubmitted(form)) {
setupForm(request, form);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
}
@@ -148,7 +149,7 @@ public class ErrataSearchAction extends RhnAction {
if (!errors.isEmpty()) {
addErrors(request, errors);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
forwardParams);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/NotifyAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/NotifyAction.java
index 140a0f4..3ac2a55 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/NotifyAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/NotifyAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.errata;
import com.redhat.rhn.domain.errata.Errata;
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.errata.ErrataManager;
import org.apache.struts.action.ActionForm;
@@ -58,7 +59,8 @@ public class NotifyAction extends RhnAction {
errata.getId().toString(), errata.getAdvisory()));
saveMessages(request, msgs);
- return getStrutsDelegate().forwardParam(mapping.findForward("default"),
- "eid", errata.getId().toString());
+ return getStrutsDelegate().forwardParam(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
+ "eid", errata.getId().toString());
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java
index c2aab1f..fc8bc96 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.rhnset.RhnSetElement;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.channel.ChannelManager;
import com.redhat.rhn.manager.errata.ErrataManager;
@@ -108,7 +109,7 @@ public class PackagePushSetupAction extends RhnListAction {
request.setAttribute("set", packageSet);
request.setAttribute("advisory", e.getAdvisory());
request.setAttribute("channel_name", c.getName());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/PublishedErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/PublishedErrataAction.java
index 22f006f..d5ddab8 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/PublishedErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/PublishedErrataAction.java
@@ -18,6 +18,7 @@ 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.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.errata.ErrataManager;
@@ -52,7 +53,7 @@ public class PublishedErrataAction extends RhnAction implements Listable {
return actionMapping.findForward("continue");
}
- return actionMapping.findForward("default");
+ return actionMapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/** {@inheritDoc} */
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/UnpublishedErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/UnpublishedErrataAction.java
index 181e391..fe482ce 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/UnpublishedErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/UnpublishedErrataAction.java
@@ -18,6 +18,7 @@ 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.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.errata.ErrataManager;
@@ -52,7 +53,7 @@ public class UnpublishedErrataAction extends RhnAction implements Listable {
return actionMapping.findForward("continue");
}
- return actionMapping.findForward("default");
+ return actionMapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/** {@inheritDoc} */
diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/CreateGroupAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/CreateGroupAction.java
index e06f7a0..384d41b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/groups/CreateGroupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/groups/CreateGroupAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.server.ServerGroupFactory;
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.manager.system.ServerGroupManager;
import org.apache.commons.lang.StringUtils;
@@ -81,7 +82,7 @@ public class CreateGroupAction extends RhnAction {
return mapping.findForward("error");
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/help/ChatAction.java b/java/code/src/com/redhat/rhn/frontend/action/help/ChatAction.java
index d652d0d..6d55f11 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/help/ChatAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/help/ChatAction.java
@@ -20,6 +20,8 @@ import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+
/**
* Static action page.
*
@@ -33,6 +35,6 @@ public class ChatAction extends org.apache.struts.action.Action {
HttpServletRequest request,
HttpServletResponse response) {
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java
index b0d03f3..ec5e6b6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.frontend.context.Context;
import com.redhat.rhn.frontend.dto.HelpDocumentOverview;
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.ListTagHelper;
import org.apache.commons.lang.StringUtils;
@@ -81,7 +82,7 @@ public class DocSearchSetupAction extends RhnAction {
if (!isSubmitted(form)) {
setupForm(request, form);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
}
@@ -139,7 +140,7 @@ public class DocSearchSetupAction extends RhnAction {
if (!errors.isEmpty()) {
addErrors(request, errors);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
forwardParams);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java b/java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java
index 8ec8669..6e328c2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.common.conf.ConfigDefaults;
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 org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -73,6 +74,6 @@ public class HelpAction extends RhnAction {
request.setAttribute("release_notes", doc);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/keys/BaseCryptoKeyEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/keys/BaseCryptoKeyEditAction.java
index e4c1a1b..7e5fce6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/keys/BaseCryptoKeyEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/keys/BaseCryptoKeyEditAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
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.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.acl.AclManager;
@@ -84,7 +85,7 @@ public abstract class BaseCryptoKeyEditAction extends RhnAction {
types.add(lvl10n("crypto.key.ssl",
KickstartFactory.KEY_TYPE_SSL.getLabel()));
request.setAttribute(TYPES, types);
- ActionForward retval = mapping.findForward("default");
+ ActionForward retval = mapping.findForward(RhnHelper.DEFAULT_FORWARD);
request.setAttribute(CSRF_TOKEN, request.getSession().getAttribute("csrf_token"));
if (isSubmitted(form)) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/keys/CryptoKeysListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/keys/CryptoKeysListSetupAction.java
index 92db1e9..b69a6cc 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/keys/CryptoKeysListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/keys/CryptoKeysListSetupAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.keys;
import com.redhat.rhn.common.db.datasource.DataResult;
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.ListTagHelper;
import com.redhat.rhn.manager.kickstart.KickstartLister;
@@ -45,7 +46,7 @@ public class CryptoKeysListSetupAction extends RhnAction {
requestContext.getCurrentUser().getOrg(), null);
request.setAttribute("pageList", result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/BaseKickstartEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/BaseKickstartEditAction.java
index 05e47b1..30d2550 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/BaseKickstartEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/BaseKickstartEditAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.common.validator.ValidatorError;
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.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.acl.AclManager;
@@ -58,7 +59,7 @@ public abstract class BaseKickstartEditAction extends RhnAction {
pex.setLocalizedSummary(ls.getMessage("permission.jsp.summary.acl.reason5"));
throw pex;
}
- String forwardname = "default";
+ String forwardname = RhnHelper.DEFAULT_FORWARD;
DynaActionForm form = (DynaActionForm) formIn;
Map params = makeParamMap(request);
RequestContext requestContext = new RequestContext(request);
@@ -104,7 +105,7 @@ public abstract class BaseKickstartEditAction extends RhnAction {
* @return String "default" that can be overridden
*/
protected String getSuccessForward() {
- return "default";
+ return RhnHelper.DEFAULT_FORWARD;
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartAdvancedOptionsAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartAdvancedOptionsAction.java
index c31bc6a..b6f45f3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartAdvancedOptionsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartAdvancedOptionsAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.kickstart.KickstartFactory;
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.manager.kickstart.KickstartOptionsCommand;
import org.apache.commons.lang.StringUtils;
@@ -179,7 +180,8 @@ public class KickstartAdvancedOptionsAction extends RhnAction {
request.setAttribute(OPTIONS, displayList);
request.setAttribute(CUSTOM_OPTIONS, cmd.getKickstartData().getCustomOptions());
- return getStrutsDelegate().forwardParams(mapping.findForward("default"),
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCloneAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCloneAction.java
index 9850d99..ed58391 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCloneAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCloneAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.common.validator.ValidatorException;
import com.redhat.rhn.domain.kickstart.builder.KickstartBuilder;
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.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.kickstart.KickstartCloneCommand;
@@ -92,12 +93,12 @@ public class KickstartCloneAction extends RhnAction {
}
catch (ValidatorException ve) {
getStrutsDelegate().saveMessages(request, ve.getResult());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
}
form.set(RequestContext.LABEL, cmd.getNewLabel());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeAction.java
index 101ed5b..663bb63 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.common.validator.ValidatorError;
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.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.acl.AclManager;
@@ -138,7 +139,7 @@ public class KickstartIpRangeAction extends RhnAction {
request.setAttribute(RANGES, displayList);
- return strutsDelegate.forwardParams(mapping.findForward("default"),
+ return strutsDelegate.forwardParams(mapping.findForward(RhnHelper.DEFAULT_FORWARD),
params);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeDeleteAction.java
index ad8c578..0aecba1 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeDeleteAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeDeleteAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.BadParameterException;
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.struts.StrutsDelegate;
import com.redhat.rhn.manager.kickstart.KickstartIpCommand;
@@ -93,7 +94,7 @@ public class KickstartIpRangeDeleteAction extends RhnAction {
request.setAttribute(RequestContext.KICKSTART,
cmd.getKickstartData());
- return strutsDelegate.forwardParams(mapping.findForward("default"),
+ return strutsDelegate.forwardParams(mapping.findForward(RhnHelper.DEFAULT_FORWARD),
params);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeSetupAction.java
index 2f0fc2c..6fb4bb5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeSetupAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.listview.PageControl;
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.ListTagHelper;
import com.redhat.rhn.manager.kickstart.KickstartLister;
import com.redhat.rhn.manager.kickstart.KickstartUrlHelper;
@@ -71,7 +72,7 @@ public class KickstartIpRangeSetupAction extends RhnAction {
request.setAttribute("pageList", getDataResult(requestContext, null));
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartOverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartOverviewAction.java
index 6bedee6..b8021d3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartOverviewAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartOverviewAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.frontend.dto.kickstart.KickstartOverviewSummaryDto;
import com.redhat.rhn.frontend.dto.kickstart.KickstartOverviewSystemsDto;
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.ListTagHelper;
import com.redhat.rhn.manager.kickstart.KickstartLister;
@@ -106,7 +107,7 @@ public class KickstartOverviewAction extends RhnAction {
rctx.getRequest().setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java
index c0003f5..d761522 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.rhnpackage.profile.Profile;
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.ListTagHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -97,7 +98,7 @@ public class KickstartPackageProfileSetupAction extends RhnAction implements Lis
ListTagHelper.selectRadioValue(helper.getListName(),
ks.getKickstartDefaults().getProfile().getId().toString(), request);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVariableAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVariableAction.java
index c0a0272..b1a6c16 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVariableAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVariableAction.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
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.struts.RhnValidationHelper;
import org.apache.struts.action.ActionForm;
@@ -70,7 +71,8 @@ public abstract class KickstartVariableAction extends RhnAction {
setupFormValues(context, (DynaActionForm) formIn, cobblerId);
request.setAttribute(getObjectString(), request.getParameter(getObjectString()));
- return getStrutsDelegate().forwardParams(mapping.findForward("default"),
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartsSetupAction.java
index c8c5616..a62e20d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartsSetupAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.frontend.dto.kickstart.CobblerProfileDto;
import com.redhat.rhn.frontend.dto.kickstart.KickstartDto;
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.ListTagHelper;
import com.redhat.rhn.frontend.taglibs.list.TagHelper;
import com.redhat.rhn.manager.kickstart.KickstartLister;
@@ -65,6 +66,6 @@ public class KickstartsSetupAction extends RhnAction {
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
request.setAttribute("pageList", result);
TagHelper.bindElaboratorTo("ksList", result.getElaborator(), request);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/cobbler/CobblerSnippetListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/cobbler/CobblerSnippetListSetupAction.java
index c071a58..7809122 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/cobbler/CobblerSnippetListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/cobbler/CobblerSnippetListSetupAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.BadParameterException;
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.ListTagHelper;
import com.redhat.rhn.manager.kickstart.cobbler.CobblerSnippetLister;
@@ -38,7 +39,6 @@ import javax.servlet.http.HttpServletResponse;
* @version $Rev: 1 $
*/
public class CobblerSnippetListSetupAction extends RhnAction {
- private static final String DEFAULT = "default";
private static final String CUSTOM = "custom";
private static final String ALL = "all";
@@ -57,7 +57,7 @@ public class CobblerSnippetListSetupAction extends RhnAction {
if (ALL.equals(mapping.getParameter())) {
result = CobblerSnippetLister.getInstance().list(user);
}
- else if (DEFAULT.equals(mapping.getParameter())) {
+ else if (RhnHelper.DEFAULT_FORWARD.equals(mapping.getParameter())) {
result = CobblerSnippetLister.getInstance().listDefault(user);
}
else if (CUSTOM.equals(mapping.getParameter())) {
@@ -70,7 +70,7 @@ public class CobblerSnippetListSetupAction extends RhnAction {
Collections.sort(result, NAME_COMPARATOR);
request.setAttribute("pageList", result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/BaseProbeSuiteEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/BaseProbeSuiteEditAction.java
index 6aa802f..12d949a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/BaseProbeSuiteEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/BaseProbeSuiteEditAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.monitoring;
import com.redhat.rhn.domain.monitoring.suite.ProbeSuite;
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.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
@@ -45,7 +46,7 @@ public abstract class BaseProbeSuiteEditAction extends RhnAction {
StrutsDelegate strutsDelegate = getStrutsDelegate();
- String forwardName = "default";
+ String forwardName = RhnHelper.DEFAULT_FORWARD;
if (isSubmitted(form)) {
ActionErrors errors = RhnValidationHelper.validateDynaActionForm(
this, form);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteListProbesSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteListProbesSetupAction.java
index c18b283..92a0068 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteListProbesSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteListProbesSetupAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.monitoring.suite.ProbeSuite;
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.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
@@ -84,7 +85,7 @@ public class ProbeSuiteListProbesSetupAction extends RhnAction implements Listab
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteListSetupAction.java
index b77cdfd..93ef3d1 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteListSetupAction.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.action.monitoring;
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.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
@@ -49,12 +50,12 @@ public class ProbeSuiteListSetupAction extends RhnAction implements Listable {
if (helper.isDispatched()) {
if (helper.getSet().size() == 0) {
getStrutsDelegate().saveMessage("probesuites.jsp.selectasuite", request);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
return mapping.findForward("remove");
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsAction.java
index ec8d427..47ce3d8 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.RhnSetAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.system.SystemManager;
@@ -113,7 +114,8 @@ public class ProbeSuiteSystemsAction extends RhnSetAction {
new Integer(updatedCount).toString());
// Clear the selected set
getSetDecl().clear(user);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuitesRemoveAction.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuitesRemoveAction.java
index 893e31e..0aae5b7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuitesRemoveAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuitesRemoveAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.rhnset.RhnSetElement;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.RhnSetAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -70,7 +71,8 @@ public class ProbeSuitesRemoveAction extends RhnSetAction {
msg.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("probesuites.none"));
strutsDelegate.saveMessages(request, msg);
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
Iterator i = set.getElements().iterator();
@@ -87,7 +89,8 @@ public class ProbeSuitesRemoveAction extends RhnSetAction {
createSuccessMessage(request, "probesuites.jsp.suitesdeleted",
new Integer(updatedCount).toString());
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseFilterEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseFilterEditAction.java
index a7d7f71..98c94eb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseFilterEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseFilterEditAction.java
@@ -27,6 +27,7 @@ import com.redhat.rhn.frontend.action.common.DateRangePicker.DatePickerResults;
import com.redhat.rhn.frontend.dto.monitoring.CheckProbeDto;
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.struts.RhnValidationHelper;
import com.redhat.rhn.manager.monitoring.ModifyFilterCommand;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
@@ -191,7 +192,7 @@ public abstract class BaseFilterEditAction extends RhnAction {
DataResult groups = MonitoringManager.getInstance().
listContactGroups(rctx.getCurrentUser());
req.setAttribute(CONTACT_GROUPS, groups);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseMethodEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseMethodEditAction.java
index c21e1f2..de9037c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseMethodEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseMethodEditAction.java
@@ -107,7 +107,7 @@ public abstract class BaseMethodEditAction extends RhnAction {
ActionForward returnActionForward = strutsDelegate.forwardParams(mapping
- .findForward("default"), request.getParameterMap());
+ .findForward(RhnHelper.DEFAULT_FORWARD), request.getParameterMap());
if (logger.isDebugEnabled()) {
logger.debug("execute(ActionMapping, ActionForm, HttpServletRequest, " +
"HttpServletResponse) - end - return value=" +
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
index 26fbed1..c413446 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgConfigAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.multiorg;
import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -52,6 +53,6 @@ public class OrgConfigAction extends RhnAction {
RequestContext.ORG_ID,
org.getId().toString());
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java
index c3312d3..44037c0 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.frontend.action.user.UserActionHelper;
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.struts.RhnValidationHelper;
import com.redhat.rhn.manager.org.CreateOrgCommand;
@@ -49,7 +50,7 @@ public class OrgCreateAction extends RhnAction {
HttpServletRequest request,
HttpServletResponse response) {
- ActionForward retval = mapping.findForward("default");
+ ActionForward retval = mapping.findForward(RhnHelper.DEFAULT_FORWARD);
DynaActionForm dynaForm = (DynaActionForm) formIn;
/*
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java
index 65268cc..85edbb2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDeleteAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.org.Org;
import com.redhat.rhn.domain.org.OrgFactory;
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.acl.AclManager;
import org.apache.struts.action.ActionForm;
@@ -48,7 +49,7 @@ public class OrgDeleteAction extends RhnAction {
RequestContext requestContext = new RequestContext(request);
Long oid = requestContext.getParamAsLong(RequestContext.ORG_ID);
- ActionForward retval = mapping.findForward("default");
+ ActionForward retval = mapping.findForward(RhnHelper.DEFAULT_FORWARD);
DynaActionForm dynaForm = (DynaActionForm) formIn;
if (!AclManager.hasAcl("user_role(satellite_admin)", request, null)) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDetailsAction.java
index ed1a730..0f63c4a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgDetailsAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.org.OrgFactory;
import com.redhat.rhn.frontend.dto.OrgDto;
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.acl.AclManager;
import com.redhat.rhn.manager.org.OrgManager;
@@ -58,7 +59,7 @@ public class OrgDetailsAction extends RhnAction {
throw pex;
}
- ActionForward retval = mapping.findForward("default");
+ ActionForward retval = mapping.findForward(RhnHelper.DEFAULT_FORWARD);
DynaActionForm dynaForm = (DynaActionForm) formIn;
if (isSubmitted(dynaForm)) {
Long oid = updateOrgDetails(mapping, dynaForm, request, response);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java
index 373e5bf..28f3038 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.org.OrgFactory;
import com.redhat.rhn.frontend.dto.OrgChannelFamily;
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.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -97,7 +98,7 @@ public class OrgSoftwareSubscriptionsAction extends RhnAction implements Listabl
request.getSession().getAttribute(makeLabel(request)));
ActionForward retval =
- mapping.findForward("default");
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD);
if (ctx.wasDispatched("orgdetails.jsp.submit")) {
ActionErrors ae = updateSubscriptions(org, request);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSystemSubscriptionsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSystemSubscriptionsAction.java
index 3911432..9e1a422 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSystemSubscriptionsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSystemSubscriptionsAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.org.OrgFactory;
import com.redhat.rhn.frontend.dto.OrgEntitlementDto;
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.struts.RhnValidationHelper;
import com.redhat.rhn.manager.entitlement.EntitlementManager;
import com.redhat.rhn.manager.org.OrgManager;
@@ -57,7 +58,7 @@ public class OrgSystemSubscriptionsAction extends RhnAction {
Org org = OrgFactory.lookupById(oid);
ActionForward retval =
- getStrutsDelegate().forwardParam(mapping.findForward("default"),
+ getStrutsDelegate().forwardParam(mapping.findForward(RhnHelper.DEFAULT_FORWARD),
"oid", oid.toString());
if (isSubmitted(dynaForm)) {
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 9a79778..bd421a6 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
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.org.OrgFactory;
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.manager.org.OrgManager;
import org.apache.struts.action.ActionForm;
@@ -71,8 +72,9 @@ public class OrgTrustDetailsAction extends RhnAction {
request.setAttribute("sysseed",
OrgManager.getSharedSubscribedSys(user, org, trustOrg));
- return getStrutsDelegate().forwardParams(mapping.findForward("default"),
- request.getParameterMap());
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
+ request.getParameterMap());
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrganizationAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrganizationAction.java
index a58d721..23ad2fc 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrganizationAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrganizationAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.db.datasource.DataList;
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.ListTagHelper;
import com.redhat.rhn.manager.org.OrgManager;
@@ -49,7 +50,7 @@ public class OrganizationAction extends RhnAction {
request.setAttribute(ListTagHelper.PAGE_LIST, result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrganizationTrustAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrganizationTrustAction.java
index aa44753..85c5c36 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrganizationTrustAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrganizationTrustAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.TrustedOrgDto;
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.ListTagHelper;
import com.redhat.rhn.manager.org.OrgManager;
@@ -54,7 +55,7 @@ public class OrganizationTrustAction extends RhnAction {
request.setAttribute(ListTagHelper.PAGE_LIST, result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatAdminAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatAdminAction.java
index 4ad6ffe..bd41a01 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatAdminAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatAdminAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.domain.user.UserFactory;
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.SatManager;
import com.redhat.rhn.manager.acl.AclManager;
@@ -48,7 +49,7 @@ public class SatAdminAction extends RhnAction {
Long uid = requestContext.getParamAsLong(RequestContext.USER_ID);
User u = UserFactory.lookupById(uid);
User current = requestContext.getCurrentUser();
- ActionForward retval = mapping.findForward("default");
+ ActionForward retval = mapping.findForward(RhnHelper.DEFAULT_FORWARD);
// protect self from removing sat admin role
if (current.getId() == u.getId()) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatRoleConfirm.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatRoleConfirm.java
index 968a310..5c1be9d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatRoleConfirm.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatRoleConfirm.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
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.manager.SatManager;
import com.redhat.rhn.manager.acl.AclManager;
import com.redhat.rhn.manager.user.UserManager;
@@ -70,7 +71,7 @@ public class SatRoleConfirm extends RhnAction {
return mapping.findForward("cancel");
}
- ActionForward retval = mapping.findForward("default");
+ ActionForward retval = mapping.findForward(RhnHelper.DEFAULT_FORWARD);
DynaActionForm dynaForm = (DynaActionForm) formIn;
if (isSubmitted(dynaForm)) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatUserListAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatUserListAction.java
index 283a4dc..c19c9c6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatUserListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SatUserListAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
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.ListTagHelper;
import com.redhat.rhn.manager.acl.AclManager;
import com.redhat.rhn.manager.org.OrgManager;
@@ -63,6 +64,6 @@ public class SatUserListAction extends RhnAction {
request.setAttribute("orgName", name);
request.setAttribute("pageList", result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementDetailsAction.java
index be080f4..d18edb2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementDetailsAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.channel.ChannelFamily;
import com.redhat.rhn.domain.channel.ChannelFamilyFactory;
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.ListTagHelper;
import org.apache.struts.action.ActionForm;
@@ -58,6 +59,6 @@ public class SoftwareEntitlementDetailsAction extends RhnAction {
request.setAttribute("pageList", channelsPageList);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementSubscriptionsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementSubscriptionsAction.java
index 7554bc0..c8a0f87 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementSubscriptionsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementSubscriptionsAction.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.frontend.dto.ChannelOverview;
import com.redhat.rhn.frontend.dto.OrgSoftwareEntitlementDto;
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.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -88,7 +89,7 @@ public class SoftwareEntitlementSubscriptionsAction extends RhnAction implements
params.put("cfid", cfid);
ListHelper helper = new ListHelper(this, request, params);
helper.execute();
- ActionForward retval = mapping.findForward("default");
+ ActionForward retval = mapping.findForward(RhnHelper.DEFAULT_FORWARD);
if (isSubmitted(dynaForm)) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementsAction.java
index c945f5a..36f9420 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementsAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.multiorg;
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.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.channel.ChannelManager;
@@ -51,7 +52,7 @@ public class SoftwareEntitlementsAction extends RhnAction implements Listable {
Long orgCount = OrgManager.getTotalOrgCount(u);
request.setAttribute("orgCount", orgCount);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementDetailsAction.java
index f821ed9..72470b7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementDetailsAction.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.action.multiorg;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
import org.apache.struts.action.ActionForm;
@@ -38,7 +39,7 @@ public class SystemEntitlementDetailsAction extends RhnAction {
request.setAttribute("name", entitlementLabel);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java
index bc26218..9463df7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.org.OrgFactory;
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.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
import com.redhat.rhn.manager.entitlement.EntitlementManager;
@@ -134,7 +135,7 @@ public class SystemEntitlementOrgsAction extends RhnAction {
request.setAttribute("ratio", ratio);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
private ActionErrors updateSubscriptions(Org org,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementsAction.java
index 3544ef2..78b2d30 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementsAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.MultiOrgSystemEntitlementsDto;
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.ListTagHelper;
import com.redhat.rhn.manager.org.OrgManager;
@@ -53,7 +54,7 @@ public class SystemEntitlementsAction extends RhnAction {
request.setAttribute("pageList", result);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java
index 946c0b4..c9b5d42 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java
@@ -40,6 +40,7 @@ import com.redhat.rhn.domain.user.UserFactory;
import com.redhat.rhn.frontend.dto.OrgTrust;
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.struts.RhnListSetHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
@@ -158,7 +159,7 @@ public class TrustAction extends FormDispatcher {
request.getRequestURI() + "?oid=" + oid);
ListTagHelper.bindSetDeclTo(LIST_NAME, RHNSET, request);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
private List<OrgTrust> getOrgs(Org theOrg) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/UserListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/UserListSetupAction.java
index 9ef53af..676b274 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/UserListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/UserListSetupAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
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.ListTagHelper;
import com.redhat.rhn.manager.org.OrgManager;
@@ -62,6 +63,6 @@ public class UserListSetupAction extends RhnAction {
request.setAttribute("pageList", result);
request.setAttribute(ListTagHelper.PARENT_URL,
request.getRequestURI() + "?oid=" + oid);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java
index 24964cf..99e79a5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.PackageListItem;
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.struts.SessionSetHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
@@ -120,8 +121,9 @@ public abstract class BaseSystemPackagesConfirmAction extends RhnAction {
request.setAttribute(HEADER_KEY, getHeaderKey());
request.setAttribute(DATA_SET, items);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"),
- request.getParameterMap());
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
+ request.getParameterMap());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackageListAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackageListAction.java
index 172aa31..11dae6d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackageListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackageListAction.java
@@ -25,6 +25,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
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.struts.RhnListSetHelper;
import com.redhat.rhn.frontend.taglibs.list.AlphaBarHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
@@ -166,7 +167,7 @@ public class CustomPackageListAction extends RhnAction {
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
request.setAttribute("pageList", result);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackagesDeleteConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackagesDeleteConfirmAction.java
index 59d6760..393906e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackagesDeleteConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackagesDeleteConfirmAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.role.RoleFactory;
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.ListTagHelper;
import com.redhat.rhn.frontend.taglibs.list.TagHelper;
import com.redhat.rhn.manager.rhnpackage.PackageManager;
@@ -94,7 +95,7 @@ public class CustomPackagesDeleteConfirmAction extends RhnAction {
params);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchSetAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchSetAction.java
index f8f6a49..d4740c4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchSetAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchSetAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.rhnpackage.WrongPackageTypeException;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.action.ActionManager;
import com.redhat.rhn.manager.rhnpackage.PackageManager;
@@ -101,7 +102,8 @@ public class InstallPatchSetAction extends LookupDispatchAction {
strutsDelegate.saveMessages(request, msgs);
Map params = makeParamMap(request);
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
/**
@@ -118,7 +120,8 @@ public class InstallPatchSetAction extends LookupDispatchAction {
HttpServletRequest request,
HttpServletResponse response) {
Map params = makeParamMap(request);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchSetSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchSetSetupAction.java
index 22f14ce..ad42df7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchSetSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchSetSetupAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.server.Server;
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.manager.rhnpackage.PackageManager;
import com.redhat.rhn.manager.system.SystemManager;
@@ -55,6 +56,6 @@ public class InstallPatchSetSetupAction extends RhnAction {
Package patchset = PackageManager.lookupByIdAndUser(pid, user);
request.setAttribute("package", patchset);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageChangeLogAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageChangeLogAction.java
index 3e60613..a18066d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageChangeLogAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageChangeLogAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.rhnpackage.PackageFactory;
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.manager.rhnpackage.PackageManager;
import org.apache.commons.lang.StringEscapeUtils;
@@ -68,7 +69,7 @@ public class PackageChangeLogAction extends RhnAction {
request.setAttribute("pid", pid);
request.setAttribute("package_name", pkg.getFilename());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
index 71c4c58..b94830c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java
@@ -25,6 +25,7 @@ import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.dto.PackageListItem;
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.xmlrpc.NoSuchPackageException;
import com.redhat.rhn.manager.download.DownloadManager;
import com.redhat.rhn.manager.rhnpackage.PackageManager;
@@ -135,7 +136,7 @@ public class PackageDetailsAction extends RhnAction {
PackageFactory.findPackagesWithDifferentArch(pkg));
request.setAttribute("pid", pid);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
PackageListItem item = PackageListItem.parse(request.getParameter("id_combo"));
Package pkg;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexAction.java
index 736c696..5bad581 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.action.ActionManager;
import com.redhat.rhn.manager.system.SystemManager;
@@ -78,7 +79,7 @@ public class PackageIndexAction extends LookupDispatchAction {
getStrutsDelegate().saveMessages(request, msg);
SdcHelper.ssmCheck(request, sid, user);
request.setAttribute("system", server);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
@@ -101,7 +102,7 @@ public class PackageIndexAction extends LookupDispatchAction {
Long sid = requestContext.getRequiredParam("sid");
SdcHelper.ssmCheck(request, sid, user);
request.setAttribute("system", SystemManager.lookupByIdAndUser(sid, user));
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
protected Map getKeyMethodMap() {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java
index b54a67f..728adb3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java
@@ -25,6 +25,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.PackageListItem;
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.struts.SessionSetHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.action.ActionManager;
@@ -85,8 +86,8 @@ public class ScheduleRemoteCommand extends RhnAction {
if (!isSubmitted(f)) {
setup(request, f);
- forward = strutsDelegate.forwardParams(mapping.findForward("default"),
- request.getParameterMap());
+ forward = strutsDelegate.forwardParams(mapping.findForward(
+ RhnHelper.DEFAULT_FORWARD), request.getParameterMap());
}
else {
ActionMessages msgs = processForm(user, server, f, request);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/SolarisPatchSetListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/SolarisPatchSetListSetupAction.java
index 3804847..bcec512 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/SolarisPatchSetListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/SolarisPatchSetListSetupAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.solarispatchset.SolarisPatchSetManager;
import com.redhat.rhn.manager.system.SystemManager;
@@ -62,8 +63,8 @@ public class SolarisPatchSetListSetupAction extends RhnListAction {
request.setAttribute("pageList", dr);
request.setAttribute("system", server);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"),
- request.getParameterMap());
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), request.getParameterMap());
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmAction.java
index 0ce78dd..81a7575 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.action.ActionManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -121,7 +122,8 @@ public class PatchConfirmAction extends LookupDispatchAction {
HttpServletRequest request,
HttpServletResponse response) {
Map params = makeParamMap(request);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallAction.java
index 6c66f9e..451c72f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.action.ActionManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -121,7 +122,8 @@ public class PatchConfirmInstallAction extends LookupDispatchAction {
HttpServletRequest request,
HttpServletResponse response) {
Map params = makeParamMap(request);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallSetupAction.java
index 214b47f..775418c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallSetupAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.SetLabels;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.solarispackage.SolarisManager;
import com.redhat.rhn.manager.system.SystemManager;
@@ -83,6 +84,6 @@ public class PatchConfirmInstallSetupAction extends RhnListAction {
request.setAttribute("pageSummary", msg);
request.setAttribute("system", server);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmSetupAction.java
index 0f7217a..acfa25e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmSetupAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.SetLabels;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.solarispackage.SolarisManager;
import com.redhat.rhn.manager.system.SystemManager;
@@ -84,6 +85,6 @@ public class PatchConfirmSetupAction extends RhnListAction {
request.setAttribute("pageSummary", msg);
request.setAttribute("system", server);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchInstallAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchInstallAction.java
index 22cae5b..02b6193 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchInstallAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchInstallAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.RhnSetAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.solarispackage.SolarisManager;
@@ -63,7 +64,8 @@ public class PatchInstallAction extends RhnSetAction {
new ActionMessage("patch.applynone"));
params = makeParamMap(formIn, request);
strutsDelegate.saveMessages(request, msg);
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
processParamMap(formIn, request, params);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchInstallSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchInstallSetupAction.java
index 3a73426..cf8f597 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchInstallSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchInstallSetupAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.solarispackage.SolarisManager;
@@ -65,8 +66,9 @@ public class PatchInstallSetupAction extends RhnListAction {
request.setAttribute("set", set);
request.setAttribute("system", server);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"),
- request.getParameterMap());
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
+ request.getParameterMap());
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchListAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchListAction.java
index edeeff0..55d0648 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchListAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.RhnSetAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.solarispackage.SolarisManager;
@@ -64,7 +65,8 @@ public class PatchListAction extends RhnSetAction {
new ActionMessage("patch.applynone"));
params = makeParamMap(formIn, request);
strutsDelegate.saveMessages(request, msg);
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
processParamMap(formIn, request, params);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchListSetupAction.java
index 0701d97..0873e0e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchListSetupAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.solarispackage.SolarisManager;
@@ -65,8 +66,8 @@ public class PatchListSetupAction extends RhnListAction {
request.setAttribute("set", set);
request.setAttribute("system", server);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"),
- request.getParameterMap());
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), request.getParameterMap());
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CreateProfileAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CreateProfileAction.java
index 9749307..351d93e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CreateProfileAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CreateProfileAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.server.Server;
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.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.profile.ProfileManager;
@@ -67,7 +68,8 @@ public class CreateProfileAction extends RhnAction {
if (!isSubmitted(f)) {
setup(request, f);
- forward = strutsDelegate.forwardParams(mapping.findForward("default"),
+ forward = strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
else {
@@ -87,7 +89,8 @@ public class CreateProfileAction extends RhnAction {
}
}
else {
- forward = strutsDelegate.forwardParams(mapping.findForward("default"),
+ forward = strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/DeleteProfileAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/DeleteProfileAction.java
index 6877ce5..b07d341 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/DeleteProfileAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/DeleteProfileAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.rhnpackage.profile.Profile;
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.struts.StrutsDelegate;
import com.redhat.rhn.manager.profile.ProfileManager;
@@ -64,7 +65,8 @@ public class DeleteProfileAction extends RhnAction {
if (!isSubmitted(f)) {
setup(request, f);
- forward = strutsDelegate.forwardParams(mapping.findForward("default"),
+ forward = strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
else {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageSetupAction.java
index 1b49949..006f11a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageSetupAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.rhnpackage.profile;
import com.redhat.rhn.frontend.action.common.BadParameterException;
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.struts.SessionSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -77,7 +78,7 @@ public class MissingPackageSetupAction extends RhnAction implements Listable {
requestContext.lookupAndBindServer();
requestContext.copyParamToAttributes("time");
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ProfileDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ProfileDetailsAction.java
index bcee90d..9c6948f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ProfileDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ProfileDetailsAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.rhnpackage.profile.Profile;
import com.redhat.rhn.domain.rhnpackage.profile.ProfileFactory;
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.profile.ProfileManager;
import org.apache.struts.action.ActionForm;
@@ -61,7 +62,7 @@ public class ProfileDetailsAction extends RhnAction {
if (!isSubmitted(form)) {
setupForm(form, profile);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ShowProfileAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ShowProfileAction.java
index c13435a..de80243 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ShowProfileAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ShowProfileAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper;
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.profile.ProfileManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.system.SystemManager;
@@ -68,7 +69,8 @@ public class ShowProfileAction extends RhnAction {
SdcHelper.ssmCheck(request, server.getId(), user);
if (!isSubmitted(f)) {
setup(request, f);
- forward = getStrutsDelegate().forwardParams(mapping.findForward("default"),
+ forward = getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
else if (buttonPressed(BTN_CREATE, f)) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesSetupAction.java
index 08d6459..8756cc5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesSetupAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.server.Server;
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.struts.SessionSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -87,8 +88,8 @@ public class SyncProfilesSetupAction extends RhnAction implements Listable {
request.setAttribute("system", server);
request.setAttribute("profilename", profile.getName());
- return getStrutsDelegate().forwardParams(mapping.findForward("default"),
- request.getParameterMap());
+ return getStrutsDelegate().forwardParams(mapping.findForward(
+ RhnHelper.DEFAULT_FORWARD), request.getParameterMap());
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsSetupAction.java
index 7104a5f..56af1bd 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsSetupAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.server.Server;
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.struts.SessionSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -86,7 +87,7 @@ public class SyncSystemsSetupAction extends RhnAction implements Listable {
request.setAttribute("system", server);
request.setAttribute("system1", server1);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java
index 343e5dc..313f7c7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.satellite.ConfigureBootstrapCommand;
@@ -108,7 +109,7 @@ public class BootstrapConfigAction extends BaseConfigAction {
form.set(ALLOW_CONFIG_ACTIONS, Boolean.TRUE);
form.set(ALLOW_REMOTE_COMMANDS, Boolean.TRUE);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
// the protocol should be specified if anything on that host is viewed
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java
index 7bf8e0f..3d1f6da 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java
@@ -18,6 +18,7 @@ package com.redhat.rhn.frontend.action.satellite;
import com.redhat.rhn.common.util.FileUtils;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -51,6 +52,6 @@ public class CatalinaAction extends RhnAction {
request.setAttribute("contents",
FileUtils.readStringFromFile("/var/log" + m.group(0) + "/catalina.out"));
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/CertificateConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/CertificateConfigAction.java
index 37ce89c..6ed8728 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/CertificateConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/CertificateConfigAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.satellite;
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.satellite.ConfigureCertificateCommand;
@@ -85,7 +86,7 @@ public class CertificateConfigAction extends BaseConfigAction {
}
request.setAttribute(CSRF_TOKEN,
request.getSession().getAttribute("csrf_token"));
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
index 9e02200..14ec368 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java
@@ -18,6 +18,7 @@ package com.redhat.rhn.frontend.action.satellite;
import com.redhat.rhn.common.validator.ValidatorError;
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.satellite.CobblerSyncCommand;
import org.apache.struts.action.ActionErrors;
@@ -55,6 +56,6 @@ public class CobblerAction extends RhnAction {
}
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
index 372667d..53cb5f2 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
import com.redhat.rhn.manager.satellite.ConfigureSatelliteCommand;
@@ -171,7 +172,7 @@ public class GeneralConfigAction extends BaseConfigAction {
}
}
}
- returnActionForward = mapping.findForward("default");
+ returnActionForward = mapping.findForward(RhnHelper.DEFAULT_FORWARD);
if (logger.isDebugEnabled()) {
logger.debug("execute(ActionMapping, ActionForm, HttpServletRequest," +
" HttpServletResponse) - end - return value=" +
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
index 2d51e97..07dc82e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.monitoring.config.ConfigMacro;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.NameDescriptionValue;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
import com.redhat.rhn.manager.satellite.ConfigureSatelliteCommand;
@@ -148,7 +149,7 @@ public class MonitoringConfigAction extends BaseConfigAction {
}
req.setAttribute("configList", nameDescVals);
- ActionForward returnActionForward = mapping.findForward("default");
+ ActionForward returnActionForward = mapping.findForward(RhnHelper.DEFAULT_FORWARD);
if (logger.isDebugEnabled()) {
logger.debug("execute(ActionMapping, ActionForm, " +
"HttpServletRequest, HttpServletResponse)" +
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/RestartAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/RestartAction.java
index 0c586fd..52fc06d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/RestartAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/RestartAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.messaging.MessageQueue;
import com.redhat.rhn.frontend.events.RestartSatelliteEvent;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import org.apache.commons.lang.BooleanUtils;
import org.apache.struts.action.ActionForm;
@@ -74,7 +75,7 @@ public class RestartAction extends RhnAction {
request.setAttribute(RESTART, Boolean.FALSE);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/TaskStatusAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/TaskStatusAction.java
index f9dae79..b85f2ca 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/TaskStatusAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/TaskStatusAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.satellite;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.task.TaskManager;
import com.redhat.rhn.taskomatic.TaskomaticApi;
@@ -62,6 +63,6 @@ public class TaskStatusAction extends RhnAction {
}
request.setAttribute("taskomatic_on", state);
request.setAttribute("list", taskInfo);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/ActionDetailsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/ActionDetailsSetupAction.java
index 91e63f5..5afe208 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/ActionDetailsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/ActionDetailsSetupAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.action.Action;
import com.redhat.rhn.domain.action.ActionFormatter;
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.action.ActionManager;
import org.apache.struts.action.ActionForm;
@@ -52,7 +53,7 @@ public class ActionDetailsSetupAction extends RhnAction {
request.setAttribute("earliestaction", af.getEarliestDate());
request.setAttribute("actionnotes", af.getNotes());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/ActionSystemsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/ActionSystemsSetupAction.java
index 7e83d5e..3e02237 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/ActionSystemsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/ActionSystemsSetupAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.action.ActionManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -70,7 +71,7 @@ public abstract class ActionSystemsSetupAction extends RhnListAction {
request.setAttribute("set", set);
request.setAttribute("newset", trackSet(set, request));
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/ArchivedActionsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/ArchivedActionsSetupAction.java
index aead44b..fb2cd04 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/ArchivedActionsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/ArchivedActionsSetupAction.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.action.schedule;
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.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.action.ActionManager;
@@ -48,7 +49,7 @@ public class ArchivedActionsSetupAction extends RhnAction implements Listable {
ListHelper helper = new ListHelper(this, request);
helper.execute();
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/BaseScheduledListAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/BaseScheduledListAction.java
index dcc6351..d69d085 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/BaseScheduledListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/BaseScheduledListAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
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.struts.StrutsDelegate;
import com.redhat.rhn.frontend.taglibs.list.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -59,7 +60,7 @@ public abstract class BaseScheduledListAction extends RhnAction implements Lista
return handleSubmit(mapping, formIn, request, response);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedSystemsAction.java
index f337072..33a1397 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedSystemsAction.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.action.schedule;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import org.apache.struts.action.ActionForm;
@@ -40,7 +41,8 @@ public class CompletedSystemsAction extends RhnListAction {
Map params = getParamMap(request);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedSystemsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedSystemsSetupAction.java
index 37571f9..d50d1b3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedSystemsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedSystemsSetupAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.action.ActionFormatter;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.action.ActionManager;
@@ -59,6 +60,6 @@ public class CompletedSystemsSetupAction extends RhnListAction {
request.setAttribute("user", user);
request.setAttribute("action", action);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/InProgressSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/InProgressSystemsAction.java
index 2a5c913..bc5af3e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/InProgressSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/InProgressSystemsAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.action.ActionFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.RhnSetAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.action.ActionManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -74,7 +75,8 @@ public class InProgressSystemsAction extends RhnSetAction {
msgs.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("systems.none"));
strutsDelegate.saveMessages(request, msgs);
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
@@ -109,7 +111,8 @@ public class InProgressSystemsAction extends RhnSetAction {
*/
int remainingSystems = ActionManager.inProgressSystems(user, action, null).size();
if (remainingSystems > 0) {
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
return mapping.findForward("noSystemsLeft");
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/PackageListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/PackageListSetupAction.java
index 7d6046b..162e26b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/PackageListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/PackageListSetupAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.action.ActionType;
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.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.action.ActionManager;
@@ -78,7 +79,7 @@ public class PackageListSetupAction extends RhnAction implements Listable {
request.setAttribute("user", user);
request.setAttribute("aid", actionId);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java
index ebcdc4c..5447f2f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.rhnset.RhnSetElement;
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.struts.StrutsDelegate;
import com.redhat.rhn.frontend.taglibs.list.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -61,7 +62,7 @@ public class PendingActionsDeleteConfirmAction extends RhnAction implements List
return cancelActions(mapping, request);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java
index b18369b..19eeefd 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.action.ssm;
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.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -48,7 +49,7 @@ public class ListSystemsAction extends RhnAction implements Listable {
helper.setListName("systemList");
helper.setDataSetName("pageList");
helper.execute();
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/MigrateSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/MigrateSystemsAction.java
index eebf713..8d15135 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/ssm/MigrateSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/MigrateSystemsAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.server.Server;
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.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.org.MigrationManager;
@@ -96,7 +97,7 @@ public class MigrateSystemsAction extends RhnAction implements Listable {
helper.setDataSetName("pageList");
helper.execute();
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/MiscIndexAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/MiscIndexAction.java
index 0357c9b..e6601e6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/ssm/MiscIndexAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/MiscIndexAction.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.action.ssm;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -69,7 +70,7 @@ public class MiscIndexAction extends RhnAction {
return mapping.findForward("confirm");
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemEditAction.java
index b175011..70a8ed1 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemEditAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.systems;
import com.redhat.rhn.common.validator.ValidatorError;
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.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.system.BaseSystemOperation;
@@ -44,7 +45,7 @@ public abstract class BaseSystemEditAction extends RhnAction {
ActionForm formIn,
HttpServletRequest request,
HttpServletResponse response) {
- String forwardname = "default";
+ String forwardname = RhnHelper.DEFAULT_FORWARD;
DynaActionForm form = (DynaActionForm) formIn;
RequestContext requestContext = new RequestContext(request);
BaseSystemOperation cmd = getOperation(requestContext);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemListSetupAction.java
index b82eedf..b1c25ee 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemListSetupAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.SystemOverview;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -62,7 +63,7 @@ public abstract class BaseSystemListSetupAction extends RhnListAction {
request.setAttribute("set", set);
request.setAttribute("pageList", dr);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
* Retrives the set declation item
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemsAction.java
index 519392b..f336f8c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemsAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.SystemOverview;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.frontend.struts.RhnListSetHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
@@ -78,7 +79,7 @@ public abstract class BaseSystemsAction extends RhnListAction {
TagHelper.bindElaboratorTo("systemList", result.getElaborator(), request);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
* Retrives the set declation item
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataConfirmSetupAction.java
index 98c332a..675ce52 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataConfirmSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataConfirmSetupAction.java
@@ -83,8 +83,8 @@ public class ErrataConfirmSetupAction extends RhnAction implements Listable {
request.setAttribute("date", picker);
request.setAttribute("system", server);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"),
- request.getParameterMap());
+ return getStrutsDelegate().forwardParams(mapping.findForward(
+ RhnHelper.DEFAULT_FORWARD), request.getParameterMap());
}
@@ -149,7 +149,8 @@ public class ErrataConfirmSetupAction extends RhnAction implements Listable {
* What happens if a few ServerActions fail to be scheduled?
*/
Map params = makeParamMap(request);
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java
index 31db720..72493a1 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper;
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.struts.StrutsDelegate;
import com.redhat.rhn.frontend.taglibs.list.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -121,7 +122,8 @@ public class ErrataSetupAction extends RhnAction implements Listable {
request.setAttribute("combo", getComboList(request));
request.setAttribute(SELECTOR, request.getParameter(SELECTOR));
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
@@ -200,7 +202,8 @@ public class ErrataSetupAction extends RhnAction implements Listable {
new ActionMessage("errata.applynone"));
params = makeParamMap(formIn, request);
strutsDelegate.saveMessages(request, msg);
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(mapping.findForward(
+ RhnHelper.DEFAULT_FORWARD), params);
}
if (sid != null) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java
index fceaad8..3785bd4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.systems;
import com.redhat.rhn.domain.rhnset.SetCleanup;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.acl.AclManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -135,7 +136,8 @@ public class OverviewAction extends RhnListAction {
//SystemGroupListAction currently redirects to a perl page for its
//two real actions. To avoid the IllegalStateException we need to
//refrain from redirecting and forwarding.
- if (forward == null || mapping.findForward("default").equals(forward)) {
+ if (forward == null ||
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD).equals(forward)) {
return forward;
}
@@ -147,7 +149,7 @@ public class OverviewAction extends RhnListAction {
new SystemGroupListSetupAction().execute(mapping, formIn, request, response);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SSMDeleteSystemsConfirm.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SSMDeleteSystemsConfirm.java
index c2fd723..4dafa8d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SSMDeleteSystemsConfirm.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SSMDeleteSystemsConfirm.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.frontend.events.SsmDeleteServersEvent;
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.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -59,7 +60,7 @@ public class SSMDeleteSystemsConfirm extends RhnAction implements Listable {
helper.setDataSetName("pageList");
helper.execute();
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
private ActionForward handleConfirm(RequestContext context,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateHardwareProfileConfirm.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateHardwareProfileConfirm.java
index 376ac15..c13ec15 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateHardwareProfileConfirm.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateHardwareProfileConfirm.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.rhnset.RhnSetElement;
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.helper.Listable;
import com.redhat.rhn.manager.action.ActionManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -90,7 +91,7 @@ public class SSMUpdateHardwareProfileConfirm extends RhnAction implements Listab
}
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"), params);
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateSoftwareProfileConfirm.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateSoftwareProfileConfirm.java
index 7cf8e68..84c97bc 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateSoftwareProfileConfirm.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateSoftwareProfileConfirm.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.server.Server;
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.helper.Listable;
import com.redhat.rhn.manager.action.ActionManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -91,7 +92,7 @@ public class SSMUpdateSoftwareProfileConfirm extends RhnAction implements Listab
}
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"), params);
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemGroupListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemGroupListSetupAction.java
index e030d38..f91fb3c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemGroupListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemGroupListSetupAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.SystemOverview;
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.struts.RhnListSetHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
import com.redhat.rhn.frontend.taglibs.list.TagHelper;
@@ -93,7 +94,7 @@ public class SystemGroupListSetupAction extends RhnAction {
ListTagHelper.setSelectedAmount("result", set.size(), request);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
protected RhnSetDecl getSetDecl() {
@@ -124,7 +125,7 @@ public class SystemGroupListSetupAction extends RhnAction {
msg.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("systemgroups.none"));
getStrutsDelegate().saveMessages(request, msg);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
// Iterator groups = groupSet.getElements().iterator();
@@ -213,7 +214,7 @@ public class SystemGroupListSetupAction extends RhnAction {
msg.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("systemgroups.none"));
getStrutsDelegate().saveMessages(request, msg);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
Iterator groups = groupSet.getElements().iterator();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
index f145100..4e44221 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchSetupAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.dto.SystemSearchResult;
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.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListRhnSetHelper;
@@ -201,7 +202,7 @@ public class SystemSearchSetupAction extends RhnAction implements Listable {
}
}
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
/**
@@ -289,7 +290,7 @@ public class SystemSearchSetupAction extends RhnAction implements Listable {
daForm.set(WHERE_TO_SEARCH, "all");
daForm.set(FINE_GRAINED, true);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CreateCustomKeyAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CreateCustomKeyAction.java
index 9b00d8e..9982f47 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CreateCustomKeyAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CreateCustomKeyAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.server.ServerFactory;
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 org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -57,7 +58,7 @@ public class CreateCustomKeyAction extends RhnAction {
request.setAttribute("old_label", label);
request.setAttribute("old_description", description);
bindMessage(requestContext, error);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
CustomDataKey key = new CustomDataKey();
@@ -71,7 +72,7 @@ public class CreateCustomKeyAction extends RhnAction {
return mapping.findForward("created");
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
private void bindMessage(RequestContext requestContext, String error) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CustomKeyListAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CustomKeyListAction.java
index 694c204..772a834 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CustomKeyListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CustomKeyListAction.java
@@ -18,6 +18,7 @@ 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.ListTagHelper;
import com.redhat.rhn.manager.system.SystemManager;
@@ -49,7 +50,7 @@ public class CustomKeyListAction extends RhnAction {
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
request.setAttribute("pageList", result);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/DeleteCustomKeyAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/DeleteCustomKeyAction.java
index 6702f98..793c0c4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/DeleteCustomKeyAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/DeleteCustomKeyAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.server.ServerFactory;
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 org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -62,7 +63,7 @@ public class DeleteCustomKeyAction extends RhnAction {
return mapping.findForward("deleted");
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/UpdateCustomKeyAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/UpdateCustomKeyAction.java
index e9de355..0410dad 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/UpdateCustomKeyAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/customkey/UpdateCustomKeyAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.server.ServerFactory;
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.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -91,7 +92,7 @@ public class UpdateCustomKeyAction extends RhnAction implements Listable {
String description = (String)form.get(DESC_PARAM);
if (description.length() < 2) {
createErrorMessage(request, "system.customkey.error.tooshort", null);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
key.setDescription(description);
@@ -100,7 +101,7 @@ public class UpdateCustomKeyAction extends RhnAction implements Listable {
return mapping.findForward("updated");
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/** {@inheritDoc} **/
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
index e24eea1..6bb3e62 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.frontend.dto.NetworkDto;
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.ListTagUtil;
import com.redhat.rhn.frontend.taglibs.list.helper.ListRhnSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
@@ -96,7 +97,7 @@ public class DuplicateSystemsAction extends RhnAction implements Listable {
request.setAttribute(inactiveButton,
"system.select.inactive");
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
private ActionForward handleConfirm(RequestContext context,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsCompareAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsCompareAction.java
index 37b50f6..2d0308f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsCompareAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsCompareAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.frontend.dto.SystemCompareDto;
import com.redhat.rhn.frontend.dto.SystemOverview;
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.helper.ListSessionSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.system.SystemManager;
@@ -116,7 +117,7 @@ public class DuplicateSystemsCompareAction extends RhnAction implements Listable
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/EligibleFlexGuestAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/EligibleFlexGuestAction.java
index 97f67a4..4d3be08 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/EligibleFlexGuestAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/EligibleFlexGuestAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.frontend.dto.ChannelFamilySystem;
import com.redhat.rhn.frontend.dto.ChannelFamilySystemGroup;
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.helper.ListSessionSetHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.system.VirtualizationEntitlementsManager;
@@ -75,7 +76,7 @@ public class EligibleFlexGuestAction extends RhnAction implements Listable {
}
request.setAttribute("selected_family", getSelectedChannel(requestContext));
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
protected String getSelectedChannel(RequestContext requestContext) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/FlexGuestAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/FlexGuestAction.java
index bddb851..ffd040b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/FlexGuestAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/FlexGuestAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.systems.entitlements;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.ChannelFamilySystemGroup;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.manager.system.VirtualizationEntitlementsManager;
@@ -53,7 +54,7 @@ public class FlexGuestAction extends EligibleFlexGuestAction {
request.setAttribute("selected_family", getSelectedChannel(requestContext));
ListHelper helper = new ListHelper(this, request);
helper.execute();
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java
index 3893067..baca395 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java
@@ -26,6 +26,7 @@ import com.redhat.rhn.domain.server.ServerGroup;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.BaseSetOperateOnSelectedItemsAction;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.entitlement.EntitlementManager;
import com.redhat.rhn.manager.monitoring.ScoutConfigPushCommand;
@@ -496,7 +497,8 @@ public class SystemEntitlementsSubmitAction extends
}
strutsDelegate.saveMessages(request, msg);
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(mapping.findForward(
+ RhnHelper.DEFAULT_FORWARD), params);
}
private boolean checkSolarisFailure(Long sid, Entitlement ent, User user) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java
index 27abf1b..1e3053a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.monitoring.command.CommandGroup;
import com.redhat.rhn.domain.monitoring.satcluster.SatClusterFactory;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.monitoring.ModifyProbeCommand;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
@@ -124,7 +125,7 @@ public abstract class BaseProbeCreateAction extends BaseProbeAction {
req.setAttribute("commands", toLabelValue(group, commands));
req.setAttribute(COMMAND, command);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeEditAction.java
index 9275494..bbfd673 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeEditAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.systems.monitoring;
import com.redhat.rhn.domain.monitoring.Probe;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.monitoring.ModifyProbeCommand;
import org.apache.struts.action.ActionForm;
@@ -71,7 +72,7 @@ public abstract class BaseProbeEditAction extends BaseProbeAction {
setIntervals(req);
setContactGroups(req, user.getOrg());
setParamValueList(req, probe, probe.getCommand(), isSubmitted(form));
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
protected abstract void addSuccessParams(RequestContext rctx, HashMap params,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDeleteAction.java
index 30f3b67..e34e3fe 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDeleteAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDeleteAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.domain.monitoring.Probe;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
import org.apache.commons.lang.StringEscapeUtils;
@@ -65,7 +66,7 @@ public class ProbeDeleteAction extends BaseProbeAction {
return getStrutsDelegate().forwardParams(mapping.findForward("deleted"),
params);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
// Copy values from the DynaActionForm into the ServerProbe object
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDetailsAction.java
index 6bfa418..6861c69 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDetailsAction.java
@@ -26,6 +26,7 @@ import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.frontend.action.common.DateRangePicker;
import com.redhat.rhn.frontend.action.common.DateRangePicker.DatePickerResults;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
@@ -205,7 +206,7 @@ public class ProbeDetailsAction extends BaseProbeAction implements Listable {
req.setAttribute(SHOW_GRAPH, Boolean.valueOf(showGraph));
req.setAttribute(SHOW_LOG, Boolean.valueOf(showLog));
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbesListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbesListSetupAction.java
index 5b607f1..4302fdb 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbesListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbesListSetupAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.systems.monitoring;
import com.redhat.rhn.domain.server.Server;
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.helper.ListHelper;
import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
@@ -52,7 +53,7 @@ public class ProbesListSetupAction extends RhnAction implements Listable {
Server server = requestContext.lookupAndBindServer();
request.setAttribute("sid", server.getId());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/PreservationListDeleteSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/PreservationListDeleteSubmitAction.java
index 8a8b8bc..48ab238 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/PreservationListDeleteSubmitAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/PreservationListDeleteSubmitAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.RhnSetAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.kickstart.KickstartLister;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -56,7 +57,7 @@ public class PreservationListDeleteSubmitAction extends RhnSetAction {
if (set.size() == 0) {
strutsDelegate.saveMessage("filelists.jsp.selectafilelist", request);
- forwardName = "default";
+ forwardName = RhnHelper.DEFAULT_FORWARD;
}
Map params = makeParamMap(formIn, request);
RhnSetManager.store(set);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java
index 2a0030b..5f9153f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java
@@ -26,6 +26,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper;
import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -136,7 +137,7 @@ public class SessionStatusAction extends RhnAction {
}
}
SdcHelper.ssmCheck(ctx.getRequest(), s.getId(), currentUser);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/AddToSSMAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/AddToSSMAction.java
index 96414b0..48f145d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/AddToSSMAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/AddToSSMAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.domain.user.UserServerPreferenceId;
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.entitlement.EntitlementManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
@@ -74,7 +75,8 @@ public class AddToSSMAction extends RhnAction {
Map params = new HashMap();
params.put("sid", sid);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java
index c05dfaf..434253e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.server.Server;
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.struts.StrutsDelegate;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
import com.redhat.rhn.manager.system.SystemManager;
@@ -63,7 +64,8 @@ public class CreateCustomDataAction extends RhnAction {
request.setAttribute("pageList", result);
request.setAttribute("system", server);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/DeleteCustomDataAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/DeleteCustomDataAction.java
index 6db321c..809ad35 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/DeleteCustomDataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/DeleteCustomDataAction.java
@@ -23,6 +23,7 @@ import com.redhat.rhn.domain.server.ServerFactory;
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.struts.StrutsDelegate;
import com.redhat.rhn.manager.system.SystemManager;
@@ -96,7 +97,8 @@ public class DeleteCustomDataAction extends RhnAction {
params);
}
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/ListCustomDataAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/ListCustomDataAction.java
index a0d5556..116c5ac 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/ListCustomDataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/ListCustomDataAction.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.domain.server.Server;
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.manager.system.SystemManager;
import org.apache.struts.action.ActionForm;
@@ -56,7 +57,7 @@ public class ListCustomDataAction extends RhnAction {
RequestContext ctx = new RequestContext(request);
User user = ctx.getLoggedInUser();
Map params = makeParamMap(request);
- String fwd = "default";
+ String fwd = RhnHelper.DEFAULT_FORWARD;
Long sid = ctx.getRequiredParam(RequestContext.SID);
Server server = SystemManager.lookupByIdAndUser(sid, user);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/NoteListAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/NoteListAction.java
index b00b08e..f99016d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/NoteListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/NoteListAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.system.SystemManager;
@@ -60,6 +61,6 @@ public class NoteListAction extends RhnListAction {
request.setAttribute("sid", sid);
request.setAttribute("system", s);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/RemoveFromSSMAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/RemoveFromSSMAction.java
index ca3dbfd..874742b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/RemoveFromSSMAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/RemoveFromSSMAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.domain.user.UserServerPreferenceId;
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.entitlement.EntitlementManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
@@ -73,7 +74,8 @@ public class RemoveFromSSMAction extends RhnAction {
}
Map params = new HashMap();
params.put("sid", sid);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java
index b2eacdb..1c75298 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.frontend.dto.ChannelOverview;
import com.redhat.rhn.frontend.dto.ChildChannelDto;
import com.redhat.rhn.frontend.dto.EssentialChannelDto;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnLookupDispatchAction;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
import com.redhat.rhn.manager.channel.ChannelManager;
@@ -155,8 +156,8 @@ public class SystemChannelsAction extends RhnLookupDispatchAction {
}
request.setAttribute(CURRENT_BASE_CHANNEL_ID, currentBaseChanId);
SdcHelper.ssmCheck(request, s.getId(), user);
- return getStrutsDelegate().forwardParam(mapping.findForward("default"),
- RequestContext.SID, s.getId().toString());
+ return getStrutsDelegate().forwardParam(mapping.findForward(
+ RhnHelper.DEFAULT_FORWARD), RequestContext.SID, s.getId().toString());
}
private List<ChannelOverview> convertToChannelOverview(List<Channel> orgChannels) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDeleteConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDeleteConfirmAction.java
index 8d7205c..c218dba 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDeleteConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDeleteConfirmAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.server.Server;
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.struts.StrutsDelegate;
import com.redhat.rhn.manager.entitlement.EntitlementManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -63,7 +64,8 @@ public class SystemDeleteConfirmAction extends RhnAction {
request.setAttribute("sid", sid);
params.put(RequestContext.SID, request.getParameter(RequestContext.SID));
- forward = strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ forward = strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
if (isSubmitted(daForm)) {
if (server.hasEntitlement(EntitlementManager.MANAGEMENT)) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java
index 32f0005..0a29a47 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java
@@ -30,6 +30,7 @@ import com.redhat.rhn.domain.user.UserServerPreferenceId;
import com.redhat.rhn.frontend.dto.EntitlementDto;
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.struts.RhnValidationHelper;
import com.redhat.rhn.manager.action.ActionManager;
import com.redhat.rhn.manager.entitlement.EntitlementManager;
@@ -91,7 +92,7 @@ public class SystemDetailsEditAction extends RhnAction {
User user = rctx.getLoggedInUser();
Server s = SystemManager.lookupByIdAndUser(
rctx.getRequiredParam(RequestContext.SID), user);
- String forwardName = "default";
+ String forwardName = RhnHelper.DEFAULT_FORWARD;
if (isSubmitted(daForm)) {
ActionErrors errors = RhnValidationHelper.validateDynaActionForm(this, daForm);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java
index 7372660..0ba7f36 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java
@@ -25,6 +25,7 @@ import com.redhat.rhn.domain.server.ServerNetAddress6;
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.ListTagHelper;
import com.redhat.rhn.manager.action.ActionManager;
import com.redhat.rhn.manager.system.SystemManager;
@@ -63,7 +64,7 @@ public class SystemHardwareAction extends RhnAction {
RequestContext ctx = new RequestContext(request);
User user = ctx.getLoggedInUser();
Map params = makeParamMap(request);
- String fwd = "default";
+ String fwd = RhnHelper.DEFAULT_FORWARD;
Long sid = ctx.getRequiredParam(RequestContext.SID);
Server server = SystemManager.lookupByIdAndUser(sid, user);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
index e2a6cf9..dee38e0 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.server.Server;
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.struts.RhnValidationHelper;
import com.redhat.rhn.manager.org.MigrationManager;
import com.redhat.rhn.manager.system.SystemManager;
@@ -56,7 +57,7 @@ public class SystemMigrateAction extends RhnAction {
RequestContext rctx = new RequestContext(request);
DynaActionForm daForm = (DynaActionForm) form;
User user = rctx.getLoggedInUser();
- String forwardName = "default";
+ String forwardName = RhnHelper.DEFAULT_FORWARD;
Integer trustedOrgCount = user.getOrg().getTrustedOrgs().size();
if (isSubmitted(daForm)) {
@@ -136,7 +137,7 @@ public class SystemMigrateAction extends RhnAction {
}
}
- if (forwardName.equals("default")) {
+ if (forwardName.equals(RhnHelper.DEFAULT_FORWARD)) {
Server s = SystemManager.lookupByIdAndUser(
rctx.getRequiredParam(RequestContext.SID), user);
Org fromOrg = s.getOrg();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteDeleteAction.java
index 646a03c..1deffbf 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteDeleteAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteDeleteAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.domain.server.Server;
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.struts.StrutsDelegate;
import com.redhat.rhn.manager.system.SystemManager;
@@ -68,8 +69,8 @@ public class SystemNoteDeleteAction extends RhnAction {
}
else {
setupPageAndFormValues(rctx.getRequest(), daForm, server, note);
- forward = strutsDelegate.forwardParams(mapping.findForward("default"),
- params);
+ forward = strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
return forward;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java
index 66c9b31..bfd7e98 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.server.ServerNoteFactory;
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.struts.StrutsDelegate;
import com.redhat.rhn.manager.system.SystemManager;
@@ -72,8 +73,8 @@ public class SystemNoteEditAction extends RhnAction {
}
params.put(RequestContext.SID, request.getParameter(RequestContext.SID));
- forward = strutsDelegate.forwardParams(mapping.findForward("default"),
- params);
+ forward = strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
if (isSubmitted(daForm)) {
ActionErrors errors = new ActionErrors();
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
index f82ab20..97ed13e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java
@@ -25,6 +25,7 @@ import com.redhat.rhn.domain.user.UserServerPreferenceId;
import com.redhat.rhn.frontend.dto.monitoring.ServerProbeComparator;
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.action.ActionManager;
import com.redhat.rhn.manager.entitlement.EntitlementManager;
import com.redhat.rhn.manager.monitoring.MonitoringManager;
@@ -137,7 +138,7 @@ public class SystemOverviewAction extends RhnAction {
request.setAttribute("system", s);
request.setAttribute("hasLocation",
!(s.getLocation() == null || s.getLocation().isEmpty()));
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
protected List findUserServerPreferences(User user, Server s) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/UpdateCustomDataAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/UpdateCustomDataAction.java
index 55a9fae..991b54a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/UpdateCustomDataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/UpdateCustomDataAction.java
@@ -22,6 +22,7 @@ import com.redhat.rhn.domain.server.Server;
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.struts.StrutsDelegate;
import com.redhat.rhn.manager.system.SystemManager;
@@ -125,7 +126,8 @@ public class UpdateCustomDataAction extends RhnAction {
params);
}
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmAction.java
index 1776159..70aaba6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmAction.java
@@ -25,6 +25,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.systems.BaseSystemListAction;
import com.redhat.rhn.frontend.dto.VirtualSystemOverview;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.system.SystemManager;
@@ -80,7 +81,8 @@ public class VirtualGuestsConfirmAction extends BaseSystemListAction {
new ActionMessage("virtualsystems.none"));
params = makeParamMap(formIn, request);
strutsDelegate.saveMessages(request, msg);
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
RequestContext ctx = new RequestContext(request);
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmSetupAction.java
index f89c42f..b7dc81e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmSetupAction.java
@@ -25,6 +25,7 @@ import com.redhat.rhn.frontend.action.systems.SystemListHelper;
import com.redhat.rhn.frontend.dto.VirtualSystemOverview;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.system.SystemManager;
import com.redhat.rhn.manager.system.VirtualizationActionCommand;
@@ -81,7 +82,7 @@ public class VirtualGuestsConfirmSetupAction extends BaseSystemListSetupAction {
request.setAttribute("pageList", dr);
request.setAttribute("system", server);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java
index 3d307d8..38b8d6e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java
@@ -25,6 +25,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.systems.BaseSystemListAction;
import com.redhat.rhn.frontend.dto.VirtualSystemOverview;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
@@ -137,7 +138,8 @@ public class VirtualGuestsListAction extends BaseSystemListAction {
(DynaActionForm)formIn);
if (!errors.isEmpty()) {
strutsDelegate.saveMessages(request, errors);
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
RhnSet set = updateSet(request);
@@ -148,7 +150,8 @@ public class VirtualGuestsListAction extends BaseSystemListAction {
new ActionMessage("virtualsystems.none"));
strutsDelegate.saveMessages(request, msg);
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
//on to the confirmation page, with the action 'type'
@@ -192,7 +195,8 @@ public class VirtualGuestsListAction extends BaseSystemListAction {
// Redirect back to the screen with error messages if any problems were found with
// the proposed guest setting changes:
if (validationErrors.size() > 0) {
- return strutsDelegate.forwardParams(mapping.findForward("default"), params);
+ return strutsDelegate.forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
return strutsDelegate.forwardParams(mapping.findForward("confirm"), params);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java
index 46b2be7..e835215 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java
@@ -28,6 +28,7 @@ import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper;
import com.redhat.rhn.frontend.dto.VirtualSystemOverview;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.channel.ChannelManager;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.system.SystemManager;
@@ -95,7 +96,7 @@ public class VirtualGuestsListSetupAction extends BaseSystemListSetupAction {
request.setAttribute("system", server);
request.setAttribute("actionOptions", getActionOptions());
request.setAttribute("guestSettingOptions", getGuestSettingOptions());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
private List getActionOptions() {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java
index 923063b..d8f0cc5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.tasko;
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.taskomatic.TaskomaticApi;
import com.redhat.rhn.taskomatic.TaskomaticApiException;
@@ -94,7 +95,7 @@ public class DeleteScheduleAction extends RhnAction {
}
}
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
index 145e4de..23edd57 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.util.RecurringEventPicker;
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.taskomatic.TaskomaticApi;
import com.redhat.rhn.taskomatic.TaskomaticApiException;
@@ -84,7 +85,7 @@ public class ScheduleDetailAction extends RhnAction {
if (!isSubmitted(form)) {
setupForm(request, form);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
@@ -97,7 +98,7 @@ public class ScheduleDetailAction extends RhnAction {
createErrorMessage(request, "message.scheduledisabled", null);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"), params);
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
return getStrutsDelegate().forwardParams(
mapping.findForward("disable"), params);
@@ -109,7 +110,7 @@ public class ScheduleDetailAction extends RhnAction {
createErrorMessage(request, "schedule.jsp.schedulenameregex", null);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"), params);
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
try {
@@ -119,7 +120,7 @@ public class ScheduleDetailAction extends RhnAction {
createErrorMessage(request,
"schedule.jsp.schedulenameinuse", scheduleName);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"), params);
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
// set the schedule
tapi.scheduleSatBunch(loggedInUser,
@@ -163,7 +164,7 @@ public class ScheduleDetailAction extends RhnAction {
}
}
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"), params);
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
private Boolean isActive(Map schedule) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java
index 70917eb..ffbb4d5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.token.ActivationKeyFactory;
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.manager.token.ActivationKeyManager;
import org.apache.struts.action.ActionForm;
@@ -60,7 +61,7 @@ public class ActivationKeyChildChannelsAction extends RhnAction {
ActivationKey key = context.lookupAndBindActivationKey();
Map params = new HashMap();
- String fwd = "default";
+ String fwd = RhnHelper.DEFAULT_FORWARD;
request.setAttribute("description", key.getNote());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyPackagesAction.java
index cd82ed2..8c0a28a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyPackagesAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.domain.token.ActivationKey;
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.struts.RhnValidationHelper;
import com.redhat.rhn.manager.token.ActivationKeyPackagesCommand;
@@ -68,7 +69,7 @@ public class ActivationKeyPackagesAction extends RhnAction {
// setup form
setupForm(form, cmd);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"),
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/AddressesAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/AddressesAction.java
index 17aafd6..453e3d7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/AddressesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/AddressesAction.java
@@ -71,7 +71,7 @@ public class AddressesAction extends RhnAction {
request.setAttribute(RhnHelper.TARGET_ADDRESS_MARKETING, marketing);
//request.setAttribute(RhnHelper.TARGET_ADDRESS_BILLING, billing);
//request.setAttribute(RhnHelper.TARGET_ADDRESS_SHIPPING, shipping);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java
index 3371cca..498e908 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java
@@ -24,6 +24,7 @@ import com.redhat.rhn.domain.user.UserFactory;
import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.dto.SystemGroupOverview;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnListAction;
import com.redhat.rhn.frontend.struts.RhnListSetHelper;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
@@ -141,7 +142,7 @@ public class AssignedGroupsSetupAction extends RhnListAction {
ListTagHelper.bindSetDeclTo(LIST_NAME, getSetDecl(), request);
request.setAttribute("pageList", dr);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/ChangeEmailSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/ChangeEmailSetupAction.java
index 81875d1..a7bf50e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/ChangeEmailSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/ChangeEmailSetupAction.java
@@ -78,8 +78,9 @@ public class ChangeEmailSetupAction extends RhnAction {
request.setAttribute("button_label", buttonLabel);
form.set("email", email);
- return getStrutsDelegate().forwardParam(mapping.findForward("default"), "uid",
- String.valueOf(targetUser.getId()));
+ return getStrutsDelegate().forwardParam(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), "uid",
+ String.valueOf(targetUser.getId()));
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java
index c1cfb89..671532e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java
@@ -80,6 +80,6 @@ public class ChannelManagementPermsSetupAction extends RhnListAction {
Boolean.valueOf(user.hasRole(RoleFactory.CHANNEL_ADMIN)));
form.set("selectedChannels", selectedChannels.toArray(new String[0]));
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java
index b5afb60..9f36cc1 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java
@@ -85,6 +85,6 @@ public class ChannelPermsSetupAction extends RhnListAction {
Boolean.valueOf(user.hasRole(RoleFactory.CHANNEL_ADMIN)));
form.set("selectedChannels", selectedChannels.toArray(new String[0]));
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java
index 249efef..557c537 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java
@@ -19,6 +19,7 @@ import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
import com.redhat.rhn.manager.user.UserManager;
@@ -99,7 +100,7 @@ public class CreateUserSetupAction extends BaseUserSetupAction {
setCurrentLocale(ctx, currentUser);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserSetupAction.java
index 429a41c..d6d28ed 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserSetupAction.java
@@ -59,6 +59,6 @@ public class DeleteUserSetupAction extends RhnAction {
User user = UserManager.lookupUser(requestContext.getLoggedInUser(), uid);
request.setAttribute(RhnHelper.TARGET_USER, user);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/DisableSelfAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/DisableSelfAction.java
index 0757c35..63771cc 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/DisableSelfAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/DisableSelfAction.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.action.user;
import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -34,7 +35,7 @@ public class DisableSelfAction extends RhnAction {
ActionForm formIn,
HttpServletRequest request,
HttpServletResponse response) {
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/DisableSelfConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/DisableSelfConfirmAction.java
index 204b860..a78c12b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/DisableSelfConfirmAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/DisableSelfConfirmAction.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.security.user.StateChangeException;
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.manager.user.UserManager;
import org.apache.struts.action.ActionErrors;
@@ -51,7 +52,8 @@ public class DisableSelfConfirmAction extends RhnAction {
User user = requestContext.getLoggedInUser();
if (!isSubmitted(f)) {
- forward = getStrutsDelegate().forwardParams(mapping.findForward("default"),
+ forward = getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
else {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/DisableUserSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/DisableUserSetupAction.java
index d2d400a..6dea08a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/DisableUserSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/DisableUserSetupAction.java
@@ -70,7 +70,7 @@ public class DisableUserSetupAction extends RhnAction {
getStrutsDelegate().saveMessages(request, msg);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/DisabledListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/DisabledListSetupAction.java
index 380727d..feb0dd7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/DisabledListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/DisabledListSetupAction.java
@@ -101,7 +101,7 @@ public class DisabledListSetupAction extends RhnAction {
ListTagHelper.bindSetDeclTo(LIST_NAME, getDecl(), request);
TagHelper.bindElaboratorTo(LIST_NAME, dr.getElaborator(), request);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
@@ -127,7 +127,7 @@ public class DisabledListSetupAction extends RhnAction {
params = makeParamMap(request);
saveMessages(request, msg);
return getStrutsDelegate().forwardParams(
- mapping.findForward("default"), params);
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
//if they chose users, send them to the confirmation page
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/EditAddressSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/EditAddressSetupAction.java
index 0026190..ed31014 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/EditAddressSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/EditAddressSetupAction.java
@@ -74,7 +74,7 @@ public class EditAddressSetupAction extends RhnAction {
request.setAttribute(
"availableCountries", UserActionHelper.getCountries());
- ActionForward fwd = mapping.findForward("default");
+ ActionForward fwd = mapping.findForward(RhnHelper.DEFAULT_FORWARD);
return fwd;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java
index 16af156..d6e2bfe 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java
@@ -94,7 +94,7 @@ public class EnableConfirmSetupAction extends RhnListAction {
request.setAttribute("pageList", dr);
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
@@ -160,7 +160,7 @@ public class EnableConfirmSetupAction extends RhnListAction {
}
addErrors(request, errors);
- return strutsDelegate.forwardParams(mapping.findForward("default"),
+ return strutsDelegate.forwardParams(mapping.findForward(RhnHelper.DEFAULT_FORWARD),
makeParamMap(request));
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/EnableUserSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/EnableUserSetupAction.java
index 58a780d..f8f9863 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/EnableUserSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/EnableUserSetupAction.java
@@ -71,6 +71,6 @@ public class EnableUserSetupAction extends RhnAction {
getStrutsDelegate().saveMessages(request, msg);
}
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/UserEditSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/UserEditSetupAction.java
index 4069f50..6873a2f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/UserEditSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/UserEditSetupAction.java
@@ -116,7 +116,7 @@ public class UserEditSetupAction extends RhnAction {
// Keep the new list tag happy:
request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
private void setupRoles(HttpServletRequest request, User targetUser) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/UserLocalePrefAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/UserLocalePrefAction.java
index c4f1ca0..c64f36b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/UserLocalePrefAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/UserLocalePrefAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.user;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.BadParameterException;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.user.UserManager;
import org.apache.struts.action.ActionForm;
@@ -100,7 +101,7 @@ public class UserLocalePrefAction extends BaseUserSetupAction {
}
form.set("uid", currentUser.getId());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
private User lookupUser(RequestContext ctx, DynaActionForm form) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/UserPrefSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/UserPrefSetupAction.java
index 0a2a7f8..7a3dc9a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/UserPrefSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/UserPrefSetupAction.java
@@ -78,7 +78,7 @@ public class UserPrefSetupAction extends RhnAction {
setupTasks(form, user);
request.setAttribute("pagesizes", getPageSizes());
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListAction.java
index bbe5d77..b6e12fa 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListAction.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.action.common.RhnSetAction;
import com.redhat.rhn.frontend.dto.BaseDto;
import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.rhnset.RhnSetManager;
import com.redhat.rhn.manager.user.UserManager;
@@ -80,7 +81,8 @@ public class VisibleSystemsListAction extends RhnSetAction {
RhnSetManager.store(rs);
Map params = makeParamMap(formIn, request);
- return getStrutsDelegate().forwardParams(mapping.findForward("default"), params);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD), params);
}
/**
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListSetupAction.java
index 7aea7ee..3761242 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListSetupAction.java
@@ -61,6 +61,6 @@ public class VisibleSystemsListSetupAction extends RhnListAction {
request.setAttribute("user", user);
request.setAttribute("set", set);
- return mapping.findForward("default");
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/struts/BaseListAction.java b/java/code/src/com/redhat/rhn/frontend/struts/BaseListAction.java
index 18fb0fb..c471c99 100644
--- a/java/code/src/com/redhat/rhn/frontend/struts/BaseListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/struts/BaseListAction.java
@@ -67,7 +67,7 @@ public abstract class BaseListAction extends RhnListAction {
request.setAttribute(RequestContext.PAGE_LIST, dr);
processRequestAttributes(requestContext);
processForm(requestContext, formIn);
- return strutsDelegate.forwardParams(mapping.findForward("default"),
+ return strutsDelegate.forwardParams(mapping.findForward(RhnHelper.DEFAULT_FORWARD),
request.getParameterMap());
}
commit 9a7436d56849842719ded917aeedf4c1ec2b0578
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jun 1 17:52:42 2012 +0200
Remove unneeded variable
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java
index 1c629c6..66c9b31 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java
@@ -49,8 +49,6 @@ public class SystemNoteEditAction extends RhnAction {
HttpServletRequest request,
HttpServletResponse response) {
- String forwardName = "default";
-
RequestContext rctx = new RequestContext(request);
DynaActionForm daForm = (DynaActionForm)form;
StrutsDelegate strutsDelegate = getStrutsDelegate();
commit 1182380fea8b15a24afb3720e635205920b53989
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jun 1 16:48:25 2012 +0200
Do not set nonexisting localization.
Better to use defaults instead.
diff --git a/java/code/src/com/redhat/rhn/domain/token/TokenFactory.java b/java/code/src/com/redhat/rhn/domain/token/TokenFactory.java
index 6fba364..d9c9393 100644
--- a/java/code/src/com/redhat/rhn/domain/token/TokenFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/token/TokenFactory.java
@@ -103,12 +103,8 @@ public class TokenFactory extends HibernateFactory {
}
if (t == null) {
LocalizationService ls = LocalizationService.getInstance();
- LookupException e = new LookupException("Could not find " +
+ throw new LookupException("Could not find " +
"token with id = " + id);
- e.setLocalizedTitle(ls.getMessage("lookup.jsp.title.token"));
- e.setLocalizedReason1(ls.getMessage("lookup.jsp.reason1.token"));
- e.setLocalizedReason2(ls.getMessage("lookup.jsp.reason2.token"));
- throw e;
}
return t;
commit 22f18b0693f7f6533c4202e7bf8145a6c45226a0
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jun 1 15:21:38 2012 +0200
Localized defaults should be localized.
Addressing following message on webui:
1. lookup.default.reason1
2. lookup.default.reason2
3. You've found an error in our site.
Note: Let's call localization service on demand and not in constructor.
Default values are used rarely. Most of the usage of the class goes
either sets own messages or it goes through xmlrpc (messages are dropped).
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/LookupException.java b/java/code/src/com/redhat/rhn/common/hibernate/LookupException.java
index 923c7a0..00bafd7 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/LookupException.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/LookupException.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2009--2010 Red Hat, Inc.
+ * Copyright (c) 2009--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
@@ -13,12 +13,10 @@
* in this software or its documentation.
*/
-/*
- * AUTOMATICALLY GENERATED FILE, DO NOT EDIT.
- */
package com.redhat.rhn.common.hibernate;
import com.redhat.rhn.common.db.DatabaseException;
+import com.redhat.rhn.common.localization.LocalizationService;
/**
* Thrown if the the object couldn't be found, or it multiple objects were found
@@ -29,6 +27,7 @@ import com.redhat.rhn.common.db.DatabaseException;
*/
public class LookupException extends DatabaseException {
+ private static LocalizationService lc = LocalizationService.getInstance();
private String localizedTitle;
private String localizedReason1;
private String localizedReason2;
@@ -42,7 +41,6 @@ public class LookupException extends DatabaseException {
*/
public LookupException(String message) {
super(message);
- setDefaults();
}
/**
@@ -55,21 +53,14 @@ public class LookupException extends DatabaseException {
*/
public LookupException(String message, Throwable cause) {
super(message, cause);
- setDefaults();
- }
-
- private void setDefaults() {
- localizedTitle = "lookup.default.title";
- localizedReason1 = "lookup.default.reason1";
- localizedReason2 = "lookup.default.reason2";
}
-
/**
* @return Returns the localizedReason1.
*/
public String getLocalizedReason1() {
- return localizedReason1;
+ return localizedReason1 != null ?
+ localizedReason1 : lc.getMessage("lookup.default.reason1");
}
@@ -85,7 +76,8 @@ public class LookupException extends DatabaseException {
* @return Returns the localizedReason2.
*/
public String getLocalizedReason2() {
- return localizedReason2;
+ return localizedReason2 != null ?
+ localizedReason2 : lc.getMessage("lookup.default.reason2");
}
@@ -101,7 +93,8 @@ public class LookupException extends DatabaseException {
* @return Returns the localizedTitle.
*/
public String getLocalizedTitle() {
- return localizedTitle;
+ return localizedTitle != null ?
+ localizedTitle : lc.getMessage("lookup.default.title");
}
commit 5c91d44ef63d675bbf86d6e3b55c56750ed3b22b
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jun 1 13:56:38 2012 +0200
Handle nonexistent testresult.
diff --git a/java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java b/java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java
index 4086ecc..ae8e2eb 100644
--- a/java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java
@@ -18,7 +18,9 @@ import java.util.HashMap;
import org.apache.log4j.Logger;
+import com.redhat.rhn.common.hibernate.LookupException;
import com.redhat.rhn.common.hibernate.HibernateFactory;
+import com.redhat.rhn.common.localization.LocalizationService;
/**
* ScapFactory - the singleton class used to fetch and store
@@ -44,6 +46,24 @@ public class ScapFactory extends HibernateFactory {
}
/**
+ * Lookup an XCCDF TestResult by the id and ensure it is assigned with given system
+ * @param xid of the XCCDF TestResult to search for
+ * @param sid of the system expected
+ * @return the XccdfTestResult found
+ */
+ public static XccdfTestResult lookupTestResultByIdAndSid(Long xid, Long sid) {
+ XccdfTestResult result = lookupTestResultById(xid);
+ if (result == null || result.getServer().getId() != sid) {
+ LocalizationService ls = LocalizationService.getInstance();
+ LookupException e = new LookupException("Could not find XCCDF scan " +
+ xid + " for system " + sid);
+
+ e.setLocalizedTitle(ls.getMessage("lookup.xccdfscan.title"));
+ throw e;
+ }
+ return result;
+ }
+ /**
* Get the Logger for the derived class so log messages
* show up on the correct class.
* @return Logger
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/XccdfDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/XccdfDetailsAction.java
index e9c17f6..7475768 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/XccdfDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/XccdfDetailsAction.java
@@ -54,7 +54,8 @@ public class XccdfDetailsAction extends RhnAction implements Listable {
Long sid = context.getRequiredParam("sid");
Server server = SystemManager.lookupByIdAndUser(sid, user);
Long xid = context.getRequiredParam("xid");
- XccdfTestResult testResult = ScapFactory.lookupTestResultById(xid);
+ XccdfTestResult testResult = ScapFactory.lookupTestResultByIdAndSid(xid,
+ server.getId());
request.setAttribute("testResult", testResult);
request.setAttribute("system", server);
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 d691c85..04feaed 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
@@ -281,6 +281,9 @@
<trans-unit id="lookup.servergroup.title">
<source>We're sorry, but the system group could not be found.</source>
</trans-unit>
+ <trans-unit id="lookup.xccdfscan.title">
+ <source>We're sorry, but the XCCDF scan could not be found.</source>
+ </trans-unit>
<trans-unit id="missing_capabilities.jsp.header">
<source>Missing Capabilities</source>
</trans-unit>
commit 79a84344084c6989caac997bef0b96f8c22a6150
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu May 31 15:40:02 2012 +0200
Show also scan's scheduler on details page.
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
index d60041b..b017e65 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
@@ -25,6 +25,15 @@
<td><c:out value="${testResult.scapActionDetails.parametersContents}"/></td>
</tr>
<tr>
+ <th><bean:message key="configoverview.jsp.scheduledBy"/>:</th>
+ <td>
+ <img src="/img/rhn-listicon-user.gif" alt="<bean:message key="yourrhn.jsp.user.alt" />"/>
+ <a href="/network/systems/details/history/event.pxt?sid=${param.sid}&hid=${testResult.scapActionDetails.parentAction.id}">
+ <c:out value="${testResult.scapActionDetails.parentAction.schedulerUser.login}"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
<th><bean:message key="system.audit.xccdfdetails.jsp.benchmarkid"/>:</th>
<td><c:out value="${testResult.benchmark.identifier}"/></td>
</tr>
commit 1a3afda2b0440e0e43b8786c8b7d8ce8e2834eec
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu May 31 15:26:19 2012 +0200
Show also scan's arguments on details page.
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
index e03d7d3..d60041b 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
@@ -21,6 +21,10 @@
<td><c:out value="${testResult.scapActionDetails.path}"/></td>
</tr>
<tr>
+ <th><bean:message key="system.audit.schedulexccdf.jsp.arguments"/>:</th>
+ <td><c:out value="${testResult.scapActionDetails.parametersContents}"/></td>
+ </tr>
+ <tr>
<th><bean:message key="system.audit.xccdfdetails.jsp.benchmarkid"/>:</th>
<td><c:out value="${testResult.benchmark.identifier}"/></td>
</tr>
1
0
Tag 'spacewalk-schema-1.8.48-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-06-05 12:34 +0000
Tagging package [spacewalk-schema] version [1.8.48-1] in directory [schema/spacewalk/].
Changes since spacewalk-backend-1.8.32-1:
Michael Mraka (4):
removed support for Red Hat Linux 6.2 and 7.[0123]
real_version() has been removed
remove rhnRedHatCanonVersion table during upgrade
Automatic commit of package [spacewalk-schema] release [1.8.48-1].
---
backend/server/handlers/xmlrpc/registration.py | 6
backend/server/rhnMapping.py | 17 -
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/data/rhnRedHatCanonVersion.sql | 103 ----------
schema/spacewalk/common/tables/rhnRedHatCanonVersion.sql | 29 --
schema/spacewalk/spacewalk-schema.spec | 5
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/056-rhnRedHatCanonVersion-drop.sql | 1
7 files changed, 8 insertions(+), 155 deletions(-)
---
1
0
Tag 'spacewalk-backend-1.8.33-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-06-05 12:35 +0000
Tagging package [spacewalk-backend] version [1.8.33-1] in directory [backend/].
Changes since spacewalk-backend-1.8.32-1:
Michael Mraka (5):
removed support for Red Hat Linux 6.2 and 7.[0123]
real_version() has been removed
remove rhnRedHatCanonVersion table during upgrade
Automatic commit of package [spacewalk-schema] release [1.8.48-1].
Automatic commit of package [spacewalk-backend] release [1.8.33-1].
---
backend/server/handlers/xmlrpc/registration.py | 6
backend/server/rhnMapping.py | 17 -
backend/spacewalk-backend.spec | 5
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/data/rhnRedHatCanonVersion.sql | 103 ----------
schema/spacewalk/common/tables/rhnRedHatCanonVersion.sql | 29 --
schema/spacewalk/spacewalk-schema.spec | 5
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/056-rhnRedHatCanonVersion-drop.sql | 1
9 files changed, 13 insertions(+), 157 deletions(-)
---
1
0
5 commits - backend/server backend/spacewalk-backend.spec rel-eng/packages schema/spacewalk
by Michael Mraka 05 Jun '12
by Michael Mraka 05 Jun '12
05 Jun '12
backend/server/handlers/xmlrpc/registration.py | 6
backend/server/rhnMapping.py | 17 -
backend/spacewalk-backend.spec | 5
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/data/rhnRedHatCanonVersion.sql | 103 ----------
schema/spacewalk/common/tables/rhnRedHatCanonVersion.sql | 29 --
schema/spacewalk/spacewalk-schema.spec | 5
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/056-rhnRedHatCanonVersion-drop.sql | 1
9 files changed, 13 insertions(+), 157 deletions(-)
New commits:
commit e1727cc23553819846ca191a9a8c6a252a17c1ea
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 5 14:35:09 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.33-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 06ada4c..51f7e94 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.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
@@ -663,6 +663,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Jun 05 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.33-1
+- removed support for Red Hat Linux 6.2 and 7.[0123]
+
* Tue Jun 05 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.32-1
- fix wrong transaction name in unsubscribe_channels (mc(a)suse.de)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 47a341d..f5489c4 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.32-1 backend/
+1.8.33-1 backend/
commit 2d7efe49a5d581066f1f29ea2989bf34b3741158
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 5 14:34:49 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.48-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index c0d22a1..061657a 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.47-1 schema/spacewalk/
+1.8.48-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 5f5bba3..90a56e8 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.47
+Version: 1.8.48
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue Jun 05 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.48-1
+- removed support for Red Hat Linux 6.2 and 7.[0123]
+
* Mon Jun 04 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.47-1
- Add support for studio image deployments (DB files) (jrenner(a)suse.de)
commit 7a15834a36718af23c7ee87e82053c81a53176b1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 5 14:31:47 2012 +0200
remove rhnRedHatCanonVersion table during upgrade
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/056-rhnRedHatCanonVersion-drop.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/056-rhnRedHatCanonVersion-drop.sql
new file mode 100644
index 0000000..d7ee39f
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/056-rhnRedHatCanonVersion-drop.sql
@@ -0,0 +1 @@
+drop table rhnRedHatCanonVersion;
commit 6beed96a227502a44a5cbf3f04cf3de1b47072d5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 5 14:29:33 2012 +0200
real_version() has been removed
diff --git a/backend/server/handlers/xmlrpc/registration.py b/backend/server/handlers/xmlrpc/registration.py
index aa55dea..0c8f0b5 100644
--- a/backend/server/handlers/xmlrpc/registration.py
+++ b/backend/server/handlers/xmlrpc/registration.py
@@ -25,7 +25,6 @@ from spacewalk.common.rhnTranslate import _, cat
from spacewalk.common.rhnLib import checkValue
from spacewalk.server.rhnLib import normalize_server_arch
from spacewalk.server.rhnServer import server_route, server_lib
-from spacewalk.server.rhnMapping import real_version
from spacewalk.server.rhnHandler import rhnHandler
from spacewalk.server import rhnUser, rhnServer, rhnSQL, rhnCapability, \
rhnChannel, rhnVirtualization
@@ -250,7 +249,7 @@ class Registration(rhnHandler):
else:
up2date_uuid = None
- release = real_version(release_version)
+ release = str(release_version)
if data.has_key('token'):
token_string = data['token']
@@ -822,8 +821,7 @@ class Registration(rhnHandler):
# we need to load the user because we will generate a new certificate
self.load_user = 1
server = self.auth_system(system_id)
- # real_version will fix it, as well as stringify it for us
- newver = real_version(newver)
+ newver = str(newver)
if not newver:
raise rhnFault(21, _("Invalid system release version requested"))
#log the entry
commit a37a5d10ee4d87c833520b7033ac61e66bc85d7e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jun 5 14:26:19 2012 +0200
removed support for Red Hat Linux 6.2 and 7.[0123]
diff --git a/backend/server/rhnMapping.py b/backend/server/rhnMapping.py
index e39a571..b757fef 100644
--- a/backend/server/rhnMapping.py
+++ b/backend/server/rhnMapping.py
@@ -15,22 +15,6 @@
from spacewalk.server import rhnSQL
-# maps a funky product release to something that is canonical
-# and has a chance of hitting some channels
-def real_version(version):
- version = str(version)
-
- h = rhnSQL.prepare("""
- select canon_version
- from rhnRedHatCanonVersion rhcv
- where rhcv.version = :version
- """)
- h.execute(version = version)
- ret = h.fetchone_dict()
- if not ret:
- return version
- return ret["canon_version"]
-
# checks if an arch is for real
def check_package_arch(name):
name = str(name)
@@ -47,6 +31,5 @@ if __name__ == '__main__':
"""Test code.
"""
rhnSQL.initDB()
- print real_version('7.1sbe')
print check_package_arch('i386')
diff --git a/schema/spacewalk/common/data/rhnRedHatCanonVersion.sql b/schema/spacewalk/common/data/rhnRedHatCanonVersion.sql
deleted file mode 100644
index 1176929..0000000
--- a/schema/spacewalk/common/data/rhnRedHatCanonVersion.sql
+++ /dev/null
@@ -1,103 +0,0 @@
---
--- Copyright (c) 2008 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.
---
---
---
---
--- data for rhnRedHatCanonVersion
-
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 7.1' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red_Hat_Linux_7.1' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.1sbe' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 7.0.91' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 7.0.95' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.0.90' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.0.91' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.0.93' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.0.95' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 7' , '7.0');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 7.0j' , '7.0');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.0J' , '7.0');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.0.1J' , '7.0');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 6.2' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red_Hat_Linux_6.2' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red_Hat_Linux_6.1' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2EE' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2.2' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2de' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2fr' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2es' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2it' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2ja' , '6.2');
-
--- and now for the junk mappings...
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 7.2' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red Hat Linux 7.2 i386' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'redhat-linux-i686-7.0' , '7.0');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- 'Red_Hat_Linux_7.2' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '6.2-1' , '6.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.0.98' , '7.1');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.1.90' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.1.90EE' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.1.91AS' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.1.93' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.1.94' , '7.2');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.2.93' , '7.3');
-insert into rhnRedHatCanonVersion (version, canon_version) values (
- '7.2.94' , '7.3');
-
-commit;
-
---
--- Revision 1.2 2002/05/06 02:59:46 misa
--- Added the beta channels
---
--- Revision 1.1 2002/03/08 23:01:05 pjones
--- split imports out into seperate files
---
diff --git a/schema/spacewalk/common/tables/rhnRedHatCanonVersion.sql b/schema/spacewalk/common/tables/rhnRedHatCanonVersion.sql
deleted file mode 100644
index 2874e7e..0000000
--- a/schema/spacewalk/common/tables/rhnRedHatCanonVersion.sql
+++ /dev/null
@@ -1,29 +0,0 @@
---
--- Copyright (c) 2008 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 TABLE rhnRedHatCanonVersion
-(
- version VARCHAR2(32) NOT NULL
- CONSTRAINT rhn_rh_canon_ver_v_pk PRIMARY KEY,
- canon_version VARCHAR2(32) NOT NULL,
- created DATE
- DEFAULT (sysdate) NOT NULL,
- modified DATE
- DEFAULT (sysdate) NOT NULL
-)
-ENABLE ROW MOVEMENT
-;
-
1
0
Tag 'spacewalk-backend-1.8.32-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-06-05 11:01 +0000
Tagging package [spacewalk-backend] version [1.8.32-1] in directory [backend/].
Changes since spacewalk-backend-1.8.31-1:
Michael Calmer (1):
fix wrong transaction name in unsubscribe_channels
Miroslav Suchý (1):
Automatic commit of package [spacewalk-backend] release [1.8.32-1].
---
backend/server/rhnChannel.py | 2 +-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
1
0
2 commits - backend/server backend/spacewalk-backend.spec rel-eng/packages
by Miroslav Suchý 05 Jun '12
by Miroslav Suchý 05 Jun '12
05 Jun '12
backend/server/rhnChannel.py | 2 +-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 7236586e562a82b3965cf258f07fee7cff461458
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jun 5 13:01:24 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.32-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 25af8b7..06ada4c 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.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
@@ -663,6 +663,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Jun 05 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.32-1
+- fix wrong transaction name in unsubscribe_channels (mc(a)suse.de)
+
* Tue Jun 05 2012 Jan Pazdziora 1.8.31-1
- No longer building spacewalk-backend-sql-oracle on Fedora 17+.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 4b2d658..47a341d 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.31-1 backend/
+1.8.32-1 backend/
commit 08dee5aa551e417215d9ad33d2d8df55efb41dd6
Author: Michael Calmer <mc(a)suse.de>
Date: Tue Jun 5 11:47:33 2012 +0200
fix wrong transaction name in unsubscribe_channels
diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py
index 2c9aad7..a48bbf2 100644
--- a/backend/server/rhnChannel.py
+++ b/backend/server/rhnChannel.py
@@ -1846,7 +1846,7 @@ def unsubscribe_channels(server_id, channels):
for channel in child_channels + base_channels:
ret = unsubscribe_sql(server_id, channel["id"], 0)
if not ret:
- rhnSQL.rollback("unsub_all_channels")
+ rhnSQL.rollback("unsub_channels")
raise rhnFault(36, "Could not unsubscribe server %s "\
"from channel %s" % (server_id, channel["label"]))
1
0
Tag 'spacewalk-backend-1.8.31-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-06-05 08:39 +0000
Tagging package [spacewalk-backend] version [1.8.31-1] in directory [backend/].
Changes since spacewalk-schema-1.8.47-1:
Jan Pazdziora (2):
No longer building spacewalk-backend-sql-oracle on Fedora 17+.
Automatic commit of package [spacewalk-backend] release [1.8.31-1].
Milan Zazrivec (7):
811470 - fix apidoc for distchannel.listDefaultMaps()
811470 - fix apidoc for kickstart.profile.comparePackages()
811470 - fix apidoc for kickstart.profile.getKickstartTree()
811470 - fix apidoc of kickstart.profile.system.checkConfigManagement()
811470 - fix apidoc for kickstart.profile.system.checkRemoteCommands()
811470 - fix apidoc for system.listLatestAvailablePackage()
811470 - proper use of xml entities in apidoc
---
backend/spacewalk-backend.spec | 13 ++++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 10 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java | 6 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 26 +++++-----
rel-eng/packages/spacewalk-backend | 2
6 files changed, 34 insertions(+), 25 deletions(-)
---
1
0
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 36af017c89ac412869c8e76064cb282d5a9f0948
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jun 5 10:39:48 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.31-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 1bb6d00..25af8b7 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.30
+Version: 1.8.31
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -663,6 +663,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Jun 05 2012 Jan Pazdziora 1.8.31-1
+- No longer building spacewalk-backend-sql-oracle on Fedora 17+.
+
* Mon Jun 04 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.30-1
- Add support for studio image deployments (backend) (jrenner(a)suse.de)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 9af27a5..4b2d658 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.30-1 backend/
+1.8.31-1 backend/
1
0
backend/spacewalk-backend.spec | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit f45171d6bb693cf526914836c4011a551b096ca4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jun 5 09:55:02 2012 +0200
No longer building spacewalk-backend-sql-oracle on Fedora 17+.
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index a91f86e..1bb6d00 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -63,6 +63,7 @@ Requires: %{name}-sql-virtual = %{version}-%{release}
This package contains the basic code that provides SQL connectivity for
the Spacewalk backend modules.
+%if 0%{?fedora} < 17
%package sql-oracle
Summary: Oracle backend for Spacewalk
Group: Applications/Internet
@@ -72,6 +73,7 @@ Provides: %{name}-sql-virtual = %{version}-%{release}
%description sql-oracle
This package contains provides Oracle connectivity for the Spacewalk backend
modules.
+%endif
%package sql-postgresql
Summary: Postgresql backend for Spacewalk
@@ -288,6 +290,10 @@ export PYTHON_MODULE_VERSION=%{version}
rm -v $RPM_BUILD_ROOT/%{apacheconfd}/zz-spacewalk-server-python.conf
+%if 0%{?fedora} > 16
+rm -rf $RPM_BUILD_ROOT%{pythonrhnroot}/server/rhnSQL/driver_cx_Oracle.py*
+%endif
+
%find_lang %{name}-server
%clean
@@ -375,9 +381,11 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/server/rhnSQL/__init__.py*
%{pythonrhnroot}/server/rhnSQL/sql_*.py*
+%if 0%{?fedora} < 17
%files sql-oracle
%doc LICENSE
%{pythonrhnroot}/server/rhnSQL/driver_cx_Oracle.py*
+%endif
%files sql-postgresql
%doc LICENSE
1
0
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 137c28a32d8dfc9f280d0ce9766119a53e8a6a38
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jun 5 09:36:09 2012 +0200
811470 - proper use of xml entities in apidoc
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
index d45786e..9597be2 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
@@ -758,7 +758,7 @@ public class SystemDetailsHandler extends BaseHandler {
* @throws FaultException A FaultException is thrown if:
* - The sessionKey is invalid
* - The kickstartLabel is invalid
- * @return the registration type -> one of reactivation/deletion/none
+ * @return the registration type -> one of reactivation/deletion/none
*
* @xmlrpc.doc returns the registration type of a given kickstart profile.
* Registration Type can be one of reactivation/deletion/none
1
0