February 2014 - spacewalk-commits - Fedora Mailing-Lists

by mkollar

java/code/src/com/redhat/rhn/common/errors/BadParameterExceptionHandler.java | 2 java/code/src/com/redhat/rhn/common/errors/LookupExceptionHandler.java | 2 java/code/src/com/redhat/rhn/common/errors/NoSuchKickstartExceptionHandler.java | 2 java/code/src/com/redhat/rhn/common/errors/PermissionExceptionHandler.java | 2 java/code/src/com/redhat/rhn/common/errors/SatelliteExceptionHandler.java | 2 java/code/src/com/redhat/rhn/frontend/action/SearchAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/audit/AuditMachineAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/audit/AuditSearchAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/audit/ListXccdfAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfDiffSubmitAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/audit/ssm/BaseSsmScheduleXccdfAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/audit/ssm/SsmScheduleXccdfConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/BaseChannelTreeAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/ChannelErrataAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/ChannelFamilyTreeAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/ChannelPackagesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/ChannelSubscribedAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/PackageNameOverviewAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/channel/PopularChannelTreeAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/channel/TargetSystemsConfirmAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesRemoveAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapDeleteAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapSetupAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 26 +++++----- java/code/src/com/redhat/rhn/frontend/action/channel/manage/ManageChannelsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/RepositoriesAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncErrataPackagesAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoListSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/ssm/BaseSubscribeAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/channel/ssm/SelectChannelAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnDiffAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnSelectedItemsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/BaseRankChannels.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java | 8 +-- java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/channel/BaseCopyToAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelDeployConfirmAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFileDeploySetup.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFileDeploySubmit.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesImportSetup.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesListSetup.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesListSubmit.java | 2 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/ChannelSystemDeploySetup.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemDeploySubmit.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemsListSetup.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemsListSubmit.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/channel/Copy2ChannelsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/channel/Copy2SystemsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/channel/DeleteChannelAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/channel/TargetSystemsListSetup.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/channel/TargetSystemsListSubmit.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/files/BaseCopyConfigFileAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareChannelAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareCopyAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareDeployedAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareDeployedSubmitAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareFileAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareRevisionAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileCentralAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileLocalAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileLocalSubmitAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileSandboxAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileSandboxSubmitAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteFileAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/DeleteRevisionAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/DiffAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/DownloadDiffAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeployConfirmSetup.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeployConfirmSubmit.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeploySetup.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeploySubmit.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/LocalRevisionDeployAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSetup.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSubmit.java | 8 +-- java/code/src/com/redhat/rhn/frontend/action/configuration/overview/GlobalConfigChannelList.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/overview/GlobalConfigFileList.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/overview/LocalConfigFileList.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/overview/ManagedSystemsList.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/overview/Overview.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/overview/TargetSystemsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/overview/TargetSystemsSubmitAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ChannelListAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListConfirmSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListConfirmSubmitAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListSetupAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ImportFileAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ImportFileSubmitAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/LocalAddFileAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/OverviewAction.java | 8 +-- java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/RankChannelsAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/SDCCopy2ChannelsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/SubscriptionsSetupAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ViewModifyPathsAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ChannelSystemsAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ConfigConfirmAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ConfigConfirmSubmitAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ConfigListAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/DiffFilesAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/DiffSystemsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/EnableListAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/EnableSubmitAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/RankChannels.java | 4 - java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeSetup.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeSubmit.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SummaryAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SystemChannelsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeConfirmSubmitAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/AddPackagesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/AddPackagesConfirmAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/errata/AffectedSystemsSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/BaseDeleteErrataAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/BaseErrataListSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListAllAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListRelevantAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/ChannelAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/errata/ChannelSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/CloneConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/CloneErrataAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/CreateAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListAllAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListRelevantAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/ErrataConfirmSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/ErrataDetailsSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/ErrataListBaseAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/ErrataPackagesSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/ListPackagesSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/PublishedErrataAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/RemovePackagesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/RemovePackagesSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListAllAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListRelevantAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/UnpublishedErrataAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/test/BaseErrataSetupActionTest.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelActionTest.java | 4 - java/code/src/com/redhat/rhn/frontend/action/errata/test/ChannelSetupActionTest.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/errata/test/DeleteBugActionTest.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/test/EditActionTest.java | 4 - java/code/src/com/redhat/rhn/frontend/action/errata/test/ListPackagesActionTest.java | 4 - java/code/src/com/redhat/rhn/frontend/action/errata/test/NotifyActionTest.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/test/NotifySetupActionTest.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/test/RemovePackagesActionTest.java | 2 java/code/src/com/redhat/rhn/frontend/action/groups/AddSystemsAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/groups/DeleteGroupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/groups/EditGroupAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/groups/GroupDetailAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/groups/ListRemoveSystemsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java | 18 +++--- java/code/src/com/redhat/rhn/frontend/action/kickstart/BaseKickstartEditAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartAdvancedOptionsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCloneAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java | 10 +-- java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartFileDownloadAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartProfileVariableAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVariableAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartsSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/kickstart/ViewTreesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/kickstart/cobbler/CobblerSnippetDetailsAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/kickstart/cobbler/CobblerSnippetListSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKickstartableSystemsAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/KickstartTreeVariableAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteListProbesSetupAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteListSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsEditAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuitesRemoveAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterListSetupActionTest.java | 2 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/ExtAuthRoleMappingAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgChannelListAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgTrustDetailsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/multiorg/OrganizationAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/multiorg/OrganizationTrustAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/multiorg/SatRoleConfirm.java | 2 java/code/src/com/redhat/rhn/frontend/action/multiorg/SatUserListAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementSubscriptionsAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/multiorg/UserListSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/renderers/YourRhnClipsRenderer.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackageListAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/CustomPackagesDeleteConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallConfirmSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchSetAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchSetSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageChangeLogAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/rhnpackage/RemoveConfirmSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ScheduleRemoteCommand.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/SolarisPatchSetListSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradeConfirmSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/VerifyConfirmSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchInstallSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchListSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/test/PatchListSetupTest.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CreateProfileAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/DeleteProfileAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/PackageListAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ProfileDetailsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ProfilesListAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ShowProfileAction.java | 8 +-- java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesSetupAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsSetupAction.java | 4 - 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 | 4 - java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageVerifyAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectRemovePackagesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectUpgradePackagesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectVerifyPackagesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/test/InstallPatchSetSetupTest.java | 2 java/code/src/com/redhat/rhn/frontend/action/satellite/CobblerAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/schedule/ActionDetailsSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/schedule/ActionSystemsSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/schedule/ArchivedActionsSetupAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/schedule/BaseScheduledListAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedActionsSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedSystemsSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/schedule/FailedSystemsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/schedule/InProgressSystemsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/schedule/PackageListSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/schedule/PendingActionsDeleteConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/ssm/ListSystemsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/ssm/MigrateSystemsAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java | 4 - java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/ssm/ViewAllLogAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/ssm/ViewCompletedLogAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogDetailsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/BaseSystemListSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/ErrataConfirmSetupAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/systems/ErrataSetupAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/systems/OverviewAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/SSMDeleteSystemsConfirm.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateHardwareProfileConfirm.java | 4 - java/code/src/com/redhat/rhn/frontend/action/systems/SSMUpdateSoftwareProfileConfirm.java | 4 - java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/SystemGroupListSetupAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/systems/SystemRemoteCommandAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/WorkWithGroupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapDownloadAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScheduleXccdfAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/audit/XccdfDetailsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CreateCustomKeyAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/customkey/CustomKeyListAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/customkey/DeleteCustomKeyAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/customkey/UpdateCustomKeyAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsAction.java | 8 +-- java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsCompareAction.java | 16 +++--- java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsDeleteSetupAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/EligibleFlexGuestAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/FlexGuestAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/VirtualizationEntitlementsAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/systems/groups/AddGroupsAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/systems/groups/BaseListAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/groups/ListRemoveGroupsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbesDeleteConfirmSetupAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/PreservationListConfirmDeleteAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/VariablesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/test/PreservationListConfirmDeleteActionTest.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/AddToSSMAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/CreateCustomDataAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/DeleteCustomDataAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/ListCustomDataAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/NoteListAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/RemoveFromSSMAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java | 8 +-- java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDeleteConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemMigrateAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteDeleteAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemNoteEditAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemRebootAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/UpdateCustomDataAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsConfirmSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/tasko/SatSchedulesAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/tasko/ScheduleDetailAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/token/ActivatedSystemsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyChildChannelsAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDeleteConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java | 10 +-- java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeysListAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/token/configuration/ListRemoveChannelsAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/token/configuration/RankChannelsAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/token/configuration/SubscribeChannelsAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/token/groups/AddGroupsAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/token/groups/ListRemoveGroupsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/user/AddressesAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/user/AdminUserEditAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/user/AssignedGroupsSetupAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/user/ChangeEmailAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/user/ChangeEmailSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/user/ChannelManagementPermsSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsSetupAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/user/CreateUserAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/user/DisableSelfConfirmAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/user/DisableUserAction.java | 2 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/EditAddressAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/user/EditAddressSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/user/EnableUserAction.java | 2 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/SelfEditAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/user/UserEditSetupAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/user/UserListSetupAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/user/UserPrefAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/user/UserPrefSetupAction.java | 4 - java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/user/VisibleSystemsListSetupAction.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/user/test/DeleteUserActionTest.java | 6 +- java/code/src/com/redhat/rhn/frontend/action/user/test/EditAddressActionTest.java | 2 java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditActionTest.java | 4 - java/code/src/com/redhat/rhn/frontend/action/user/test/UserPrefActionTest.java | 2 java/code/src/com/redhat/rhn/frontend/servlets/AuthFilter.java | 2 java/code/src/com/redhat/rhn/frontend/servlets/LocalizedEnvironmentFilter.java | 2 java/code/src/com/redhat/rhn/frontend/struts/BaseListAction.java | 2 java/code/src/com/redhat/rhn/frontend/struts/BaseSetHelper.java | 2 java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java | 18 +++--- java/code/src/com/redhat/rhn/frontend/struts/RhnRequestProcessor.java | 2 java/code/src/com/redhat/rhn/frontend/struts/RhnSetHelper.java | 8 +-- java/code/src/com/redhat/rhn/frontend/struts/test/RequestContextTest.java | 2 java/code/src/com/redhat/rhn/frontend/struts/test/RhnListActionTest.java | 2 java/code/src/com/redhat/rhn/frontend/struts/test/RhnUnpagedListActionTest.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/NavMenuTag.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/helpers/ListViewHelper.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/list/collection/WebRhnSet.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemCurrencyIconDecorator.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemIconDecorator.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListRhnSetHelper.java | 2 java/code/src/com/redhat/rhn/manager/acl/AclManager.java | 2 java/code/src/com/redhat/rhn/testing/ActionHelper.java | 2 402 files changed, 603 insertions(+), 603 deletions(-) New commits: commit c12c5c6a3282285fd2bbc5153b39abfe9fd5e202 Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Feb 20 09:31:02 2014 +0100 Use enhanced for loop diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java b/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java index b0466ac..342f2a2 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java @@ -607,8 +607,8 @@ public class RequestContext { '&'); // Convert the parameters into a map so we can // easily replace the value and reformat the query string. - for (int i = 0; i < params.length; i++) { - String[] nameval = StringUtils.split(params[i], '='); + for (String param : params) { + String[] nameval = StringUtils.split(param, '='); parammap.put(nameval[0], nameval[1]); } parammap.remove(name); commit 187e1987321a2451d8285ab76fa27fc4e8ba458f Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Feb 20 08:16:14 2014 +0100 Use generics diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java b/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java index a602863..b0466ac 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java @@ -573,8 +573,8 @@ public class RequestContext { * @return Returns a new hashmap containing the parameters */ // TODO Write unit tests for makeParamMapWithPagination() - public Map makeParamMapWithPagination() { - Map params = new HashMap(); + public Map<String,String> makeParamMapWithPagination() { + Map<String,String> params = new HashMap<String,String>(); String lower = processPagination(); if (lower != null && lower.length() > 0 && StringUtils.isNumeric(lower)) { commit 3c631fd591d07969db8d4f4ed0ad2247da8b0218 Author: Matej Kollar <mkollar(a)redhat.com> Date: Thu Feb 20 07:49:40 2014 +0100 Privatization of getLoggedInUser Obtaining current user is done quite often so using getCurrentUser that is caching result of getLoggedInUser is better. diff --git a/java/code/src/com/redhat/rhn/common/errors/BadParameterExceptionHandler.java b/java/code/src/com/redhat/rhn/common/errors/BadParameterExceptionHandler.java index bb9cace..0452fd6 100644 --- a/java/code/src/com/redhat/rhn/common/errors/BadParameterExceptionHandler.java +++ b/java/code/src/com/redhat/rhn/common/errors/BadParameterExceptionHandler.java @@ -66,7 +66,7 @@ public class BadParameterExceptionHandler extends ExceptionHandler { protected void storeException(HttpServletRequest request, String property, ActionMessage msg, ActionForward forward, String scope) { TraceBackEvent evt = new TraceBackEvent(); - User usr = new RequestContext(request).getLoggedInUser(); + User usr = new RequestContext(request).getCurrentUser(); evt.setUser(usr); evt.setRequest(request); evt.setException(exception); diff --git a/java/code/src/com/redhat/rhn/common/errors/LookupExceptionHandler.java b/java/code/src/com/redhat/rhn/common/errors/LookupExceptionHandler.java index e5ade3a..7e31c35 100644 --- a/java/code/src/com/redhat/rhn/common/errors/LookupExceptionHandler.java +++ b/java/code/src/com/redhat/rhn/common/errors/LookupExceptionHandler.java @@ -70,7 +70,7 @@ public class LookupExceptionHandler extends ExceptionHandler { if (Config.get().getBoolean(ConfigDefaults.LOOKUP_EXCEPT_SEND_EMAIL)) { TraceBackEvent evt = new TraceBackEvent(); RequestContext requestContext = new RequestContext(request); - User usr = requestContext.getLoggedInUser(); + User usr = requestContext.getCurrentUser(); evt.setUser(usr); evt.setRequest(request); evt.setException(exception); diff --git a/java/code/src/com/redhat/rhn/common/errors/NoSuchKickstartExceptionHandler.java b/java/code/src/com/redhat/rhn/common/errors/NoSuchKickstartExceptionHandler.java index 11ec748..e877806 100644 --- a/java/code/src/com/redhat/rhn/common/errors/NoSuchKickstartExceptionHandler.java +++ b/java/code/src/com/redhat/rhn/common/errors/NoSuchKickstartExceptionHandler.java @@ -49,7 +49,7 @@ public class NoSuchKickstartExceptionHandler extends ExceptionHandler { TraceBackEvent evt = new TraceBackEvent(); RequestContext requestContext = new RequestContext(request); - User usr = requestContext.getLoggedInUser(); + User usr = requestContext.getCurrentUser(); evt.setUser(usr); evt.setRequest(request); evt.setException(ex); diff --git a/java/code/src/com/redhat/rhn/common/errors/PermissionExceptionHandler.java b/java/code/src/com/redhat/rhn/common/errors/PermissionExceptionHandler.java index 878f78e..1269be3 100644 --- a/java/code/src/com/redhat/rhn/common/errors/PermissionExceptionHandler.java +++ b/java/code/src/com/redhat/rhn/common/errors/PermissionExceptionHandler.java @@ -51,7 +51,7 @@ public class PermissionExceptionHandler extends ExceptionHandler { TraceBackEvent evt = new TraceBackEvent(); RequestContext requestContext = new RequestContext(request); - User usr = requestContext.getLoggedInUser(); + User usr = requestContext.getCurrentUser(); evt.setUser(usr); evt.setRequest(request); evt.setException(ex); diff --git a/java/code/src/com/redhat/rhn/common/errors/SatelliteExceptionHandler.java b/java/code/src/com/redhat/rhn/common/errors/SatelliteExceptionHandler.java index 401ae64..f6df002 100644 --- a/java/code/src/com/redhat/rhn/common/errors/SatelliteExceptionHandler.java +++ b/java/code/src/com/redhat/rhn/common/errors/SatelliteExceptionHandler.java @@ -48,7 +48,7 @@ public class SatelliteExceptionHandler extends ExceptionHandler { ActionMessage msg, ActionForward forward, String scope) { TraceBackEvent evt = new TraceBackEvent(); RequestContext requestContext = new RequestContext(request); - User usr = requestContext.getLoggedInUser(); + User usr = requestContext.getCurrentUser(); evt.setUser(usr); evt.setRequest(request); evt.setException(exception); 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 86b2699..92801f2 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/SearchAction.java @@ -48,7 +48,7 @@ public class SearchAction extends RhnAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); DynaActionForm daForm = (DynaActionForm) formIn; if (isSubmitted(daForm)) { 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 e31b5ac..bcad253 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 @@ -69,7 +69,7 @@ public class AuditMachineAction extends RhnAction implements Listable { if (reviewed != null && reviewed.length() > 0) { start = Long.parseLong(request.getParameter("startMilli")); end = Long.parseLong(request.getParameter("endMilli")); - username = requestContext.getLoggedInUser().getLogin(); + username = requestContext.getCurrentUser().getLogin(); log.debug("reviewed: " + machine + ", " + start + ", " + end + ", " + username); 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 13ee073..e732545 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 @@ -174,7 +174,7 @@ public class AuditSearchAction extends RhnAction { String[] autypes; request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI()); - request.setAttribute("user", requestContext.getLoggedInUser()); + request.setAttribute("user", requestContext.getCurrentUser()); // what audit types are we looking at? autypes = dform.getStrings("autypes"); diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/ListXccdfAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/ListXccdfAction.java index 1e0bb43..a6ae2a9 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/audit/ListXccdfAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/audit/ListXccdfAction.java @@ -57,7 +57,7 @@ public class ListXccdfAction extends RhnAction implements Listable { */ public List getResult(RequestContext context) { HttpServletRequest request = context.getRequest(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult results = ScapManager.latestTestResultByUser(user); TagHelper.bindElaboratorTo("groupSet", results.getElaborator(), request); return results; diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfDiffSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfDiffSubmitAction.java index d39dc36..32c6273 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfDiffSubmitAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfDiffSubmitAction.java @@ -69,7 +69,7 @@ public class XccdfDiffSubmitAction extends RhnAction implements Listable { Long first = (Long) form.get(FIRST); Long second = (Long) form.get(SECOND); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); String view = getView(request); if (!ScapManager.isAvailableToUser(user, first)) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/ssm/BaseSsmScheduleXccdfAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/ssm/BaseSsmScheduleXccdfAction.java index f1b8e8e..f7f62b3 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/audit/ssm/BaseSsmScheduleXccdfAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/audit/ssm/BaseSsmScheduleXccdfAction.java @@ -47,7 +47,7 @@ public abstract class BaseSsmScheduleXccdfAction * {@inheritDoc} */ public List getResult(RequestContext context) { - return ScapManager.systemsInSsmAndScapCapability(context.getLoggedInUser()); + return ScapManager.systemsInSsmAndScapCapability(context.getCurrentUser()); } protected void setupListHelper(HttpServletRequest request) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/ssm/SsmScheduleXccdfConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/ssm/SsmScheduleXccdfConfirmAction.java index 28ca5fe..a8962a2 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/audit/ssm/SsmScheduleXccdfConfirmAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/audit/ssm/SsmScheduleXccdfConfirmAction.java @@ -74,7 +74,7 @@ public class SsmScheduleXccdfConfirmAction extends BaseSsmScheduleXccdfAction { ScapAction scapAction = null; try { scapAction = ScapManager.scheduleXccdfEvalInSsm( - context.getLoggedInUser(), + context.getCurrentUser(), (String) form.get(PATH), (String) form.get(PARAMS), getStrutsDelegate().readDatePicker(form, DATE, 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 9cfb14d..8c92825 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 @@ -45,7 +45,7 @@ public abstract class BaseChannelTreeAction extends RhnUnpagedListAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); ListControl lc = new ListControl(); filterList(lc, request, user); 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 ae90b3a..605240a 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 @@ -50,7 +50,7 @@ public class ChannelDetailsAction extends RhnAction { DynaActionForm form = (DynaActionForm)formIn; RequestContext ctx = new RequestContext(request); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); Map params = makeParamMap(request); String fwd = 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 c480aa7..8280328 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 @@ -45,7 +45,7 @@ public class ChannelErrataAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); long cid = requestContext.getRequiredParam("cid"); 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 6a7df1f..f17226b 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 @@ -49,7 +49,7 @@ public class ChannelFamilyTreeAction extends BaseChannelTreeAction { Long cfid = requestContext.getRequiredParam("cfid"); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); ChannelOverview co = ChannelManager.getEntitlement(user.getOrg().getId(), cfid); ListControl lc = new ListControl(); 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 e9eff3b..9d90f02 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 @@ -46,7 +46,7 @@ public class ChannelPackagesAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); long cid = requestContext.getRequiredParam("cid"); 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 f7dd7b8..253bb1d 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 @@ -54,7 +54,7 @@ public class ChannelSubscribedAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); long cid = requestContext.getRequiredParam("cid"); Channel chan = ChannelFactory.lookupByIdAndUser(cid, user); 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 8c79cd0..de4c737 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 @@ -51,7 +51,7 @@ public class PackageNameOverviewAction extends RhnAction { request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI()); RequestContext ctx = new RequestContext(request); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); List dr = Collections.EMPTY_LIST; if (StringUtils.equals(subscribedChannels, "yes")) { 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 3c8ea67..3ae50d8 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 @@ -87,7 +87,7 @@ public class PackageSearchAction extends BaseSearchAction { List<Map<String, String>> channelArches = buildChannelArches(); // Load list of available channels to select as filter - List allChannels = ChannelManager.allChannelsTree(ctx.getLoggedInUser()); + List allChannels = ChannelManager.allChannelsTree(ctx.getCurrentUser()); request.setAttribute(SEARCH_STR, searchString); request.setAttribute(VIEW_MODE, viewmode); @@ -137,7 +137,7 @@ public class PackageSearchAction extends BaseSearchAction { throws XmlRpcFault, MalformedURLException { List<PackageOverview> results = PackageSearchHelper.performSearch(ctx.getWebSession().getId(), - searchString, viewmode, selectedArches, ctx.getLoggedInUser() + searchString, viewmode, selectedArches, ctx.getCurrentUser() .getId(), fineGrained, filterChannelId, searchCriteria); // Perform any post-search logic that wasn't done by the search server diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PopularChannelTreeAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/PopularChannelTreeAction.java index 6b088df..8c2943c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/PopularChannelTreeAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PopularChannelTreeAction.java @@ -52,7 +52,7 @@ public class PopularChannelTreeAction extends BaseChannelTreeAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); String countStr = request.getParameter(SERVER_COUNT); Long count; if (countStr == null) { 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 77d21da..1c068de 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 @@ -53,7 +53,7 @@ public class TargetSystemsAction extends RhnAction implements Listable { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long cid = requestContext.getRequiredParam(RequestContext.CID); Channel chan = ChannelManager.lookupByIdAndUser(cid, user); @@ -80,7 +80,7 @@ public class TargetSystemsAction extends RhnAction implements Listable { * {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Long cid = context.getRequiredParam(RequestContext.CID); Channel chan = ChannelManager.lookupByIdAndUser(cid, user); return SystemManager.listTargetSystemForChannel(user, chan); 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 48fef7d..2a9117e 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 @@ -57,7 +57,7 @@ public class TargetSystemsConfirmAction extends RhnAction implements Listable { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long cid = requestContext.getRequiredParam(RequestContext.CID); Channel chan = ChannelManager.lookupByIdAndUser(cid, user); @@ -105,7 +105,7 @@ public class TargetSystemsConfirmAction extends RhnAction implements Listable { * {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Long cid = context.getRequiredParam(RequestContext.CID); Channel chan = ChannelManager.lookupByIdAndUser(cid, user); return SystemManager.inSet(user, TargetSystemsAction.getSetDecl(chan).getLabel()); 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 ef5b479..c97f552 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 @@ -77,7 +77,7 @@ public class AddCustomErrataAction extends RhnListAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long cid = Long.parseLong(request.getParameter(CID)); Channel currentChan = ChannelFactory.lookupByIdAndUser(cid, user); Channel selectedChannel = null; 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 7b294a5..e922db5 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 @@ -84,7 +84,7 @@ public class AddRedHatErrataAction extends RhnListAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long cid = Long.parseLong(request.getParameter(CID)); Channel currentChan = ChannelFactory.lookupByIdAndUser(cid, user); Channel selectedChannel = null; 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 0806117..3ba2a59 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 @@ -44,7 +44,7 @@ public class ChannelPackageMenuAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); long cid = requestContext.getRequiredParam("cid"); 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 3e8decc..6fe71cb 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 @@ -61,7 +61,7 @@ public class ChannelPackagesAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); long cid = requestContext.getRequiredParam("cid"); Channel chan = ChannelFactory.lookupByIdAndUser(cid, user); 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 4a731d5..b5ecaab 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 @@ -68,7 +68,7 @@ public class ChannelPackagesAddAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); long cid = requestContext.getRequiredParam("cid"); Channel chan = ChannelFactory.lookupByIdAndUser(cid, user); 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 c005639..51b0255 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 @@ -65,7 +65,7 @@ public class ChannelPackagesAddConfirmAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); long cid = requestContext.getRequiredParam("cid"); Channel chan = ChannelFactory.lookupByIdAndUser(cid, user); 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 175328b..d070ea4 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 @@ -64,7 +64,7 @@ public class ChannelPackagesRemoveAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); long cid = requestContext.getRequiredParam("cid"); Channel chan = ChannelFactory.lookupByIdAndUser(cid, user); 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 a76f52b..6cabe30 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 @@ -73,7 +73,7 @@ public class ConfirmErrataAction extends RhnListAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long cid = Long.parseLong(request.getParameter(CID)); Channel currentChan = ChannelFactory.lookupByIdAndUser(cid, user); boolean packageAssoc = request.getParameter(CHECKED) != null; 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 2366516..2c00ade 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 @@ -58,7 +58,7 @@ public class DeleteChannelAction extends RhnAction { throws Exception { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); String sChannelId = request.getParameter("cid"); long channelId = Long.parseLong(sChannelId); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapDeleteAction.java index 0790bef..7ec352b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapDeleteAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapDeleteAction.java @@ -41,7 +41,7 @@ public class DistChannelMapDeleteAction extends RhnAction { HttpServletRequest request, HttpServletResponse response) { RequestContext ctx = new RequestContext(request); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); Long dcmId = ctx.getRequiredParam("dcm"); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java index fc866cc..58ebbe8 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java @@ -62,7 +62,7 @@ public class DistChannelMapEditAction extends RhnAction { HttpServletResponse response) { DynaActionForm form = (DynaActionForm) formIn; RequestContext ctx = new RequestContext(request); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); // setup channel architectures List channelArches = new ArrayList(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapSetupAction.java index 2150cb7..fedc550 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapSetupAction.java @@ -44,7 +44,7 @@ public class DistChannelMapSetupAction extends RhnAction implements Listable { public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); ListHelper helper = new ListHelper(this, request); helper.execute(); @@ -57,6 +57,6 @@ public class DistChannelMapSetupAction extends RhnAction implements Listable { public DataResult getResult(RequestContext context) { return new DataResult( ChannelFactory.listAllDistChannelMapsByOrg( - context.getLoggedInUser().getOrg())); + context.getCurrentUser().getOrg())); } } 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 a75dc40..de2c80d 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 @@ -107,7 +107,7 @@ public class EditChannelAction extends RhnAction implements Listable { if (hasSharingChanged(form, ctx) && ("private".equals(sharing) || "protected".equals(sharing))) { // forward to confirm page - request.setAttribute("org", ctx.getLoggedInUser().getOrg()); + request.setAttribute("org", ctx.getCurrentUser().getOrg()); formToAttributes(request, form); Map urlParams = new HashMap(); urlParams.put(RequestContext.CID, @@ -184,7 +184,7 @@ public class EditChannelAction extends RhnAction implements Listable { */ private boolean hasSharingChanged(DynaActionForm form, RequestContext ctx) { Long cid = ctx.getParamAsLong("cid"); - Channel c = ChannelFactory.lookupByIdAndUser(cid, ctx.getLoggedInUser()); + Channel c = ChannelFactory.lookupByIdAndUser(cid, ctx.getCurrentUser()); return !c.getAccess().equals(form.get("org_sharing")); } @@ -234,7 +234,7 @@ public class EditChannelAction extends RhnAction implements Listable { RequestContext ctx) { Channel c = edit(form, errors, ctx); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); unsubscribeOrgsFromChannel(user, c, Channel.PROTECTED); @@ -297,7 +297,7 @@ public class EditChannelAction extends RhnAction implements Listable { // if there was no exception during the above edit // add all of the orgs to the "rhnchanneltrust" if (c != null) { - Org org = ctx.getLoggedInUser().getOrg(); + Org org = ctx.getCurrentUser().getOrg(); Set<Org> trustedorgs = org.getTrustedOrgs(); c.setTrustedOrgs(trustedorgs); ChannelFactory.save(c); @@ -308,7 +308,7 @@ public class EditChannelAction extends RhnAction implements Listable { ActionErrors errors, RequestContext ctx) { - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); Long cid = ctx.getParamAsLong("cid"); Channel channel = ChannelFactory.lookupById(cid); unsubscribeOrgsFromChannel(user, channel, Channel.PRIVATE); @@ -319,7 +319,7 @@ public class EditChannelAction extends RhnAction implements Listable { ActionErrors errors, RequestContext ctx) { - User loggedInUser = ctx.getLoggedInUser(); + User loggedInUser = ctx.getCurrentUser(); Channel updated = null; // handle submission @@ -389,7 +389,7 @@ public class EditChannelAction extends RhnAction implements Listable { ActionErrors errors, RequestContext ctx) { - User loggedInUser = ctx.getLoggedInUser(); + User loggedInUser = ctx.getCurrentUser(); Long cid = null; // handle submission @@ -544,8 +544,8 @@ public class EditChannelAction extends RhnAction implements Listable { if (cid != null) { Channel c = ChannelManager.lookupByIdAndUser(cid, - ctx.getLoggedInUser()); - if (!UserManager.verifyChannelAdmin(ctx.getLoggedInUser(), c)) { + ctx.getCurrentUser()); + if (!UserManager.verifyChannelAdmin(ctx.getCurrentUser(), c)) { throw new PermissionException(RoleFactory.CHANNEL_ADMIN); } @@ -566,7 +566,7 @@ public class EditChannelAction extends RhnAction implements Listable { else { form.set("checksum", c.getChecksumTypeLabel()); } - if (c.isGloballySubscribable(ctx.getLoggedInUser().getOrg())) { + if (c.isGloballySubscribable(ctx.getCurrentUser().getOrg())) { form.set("per_user_subscriptions", "all"); } else { @@ -599,7 +599,7 @@ public class EditChannelAction extends RhnAction implements Listable { if (!ChannelManager.getLatestSyncLogFiles(c).isEmpty()) { request.setAttribute("log_url", DownloadManager.getChannelSyncLogDownloadPath(c, - ctx.getLoggedInUser())); + ctx.getCurrentUser())); } } @@ -622,7 +622,7 @@ public class EditChannelAction extends RhnAction implements Listable { } private void prepDropdowns(RequestContext ctx) { - User loggedInUser = ctx.getLoggedInUser(); + User loggedInUser = ctx.getCurrentUser(); // populate parent base channels List baseChannels = new ArrayList(); List<Channel> bases = ChannelManager.findAllBaseChannelsForOrg( @@ -696,7 +696,7 @@ public class EditChannelAction extends RhnAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext ctx) { - Org org = ctx.getLoggedInUser().getOrg(); + Org org = ctx.getCurrentUser().getOrg(); Set<Org> trustedorgs = org.getTrustedOrgs(); List<OrgTrust> trusts = new ArrayList<OrgTrust>(); for (Org o : trustedorgs) { 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 8ab46a3..59a1b6e 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 @@ -52,7 +52,7 @@ public class ManageChannelsAction extends RhnAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult result = ChannelManager.ownedChannelsTree(user); return result; } 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 bdbe461..8907a1c 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 @@ -61,7 +61,7 @@ public class PublishErrataAction extends RhnListAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long cid = Long.parseLong(request.getParameter(CID)); Channel currentChan = ChannelFactory.lookupByIdAndUser(cid, user); 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 2cd7a46..902d9c8 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 @@ -55,7 +55,7 @@ public class RepositoriesAction extends RhnAction implements Listable { HttpServletResponse response) { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); long cid = context.getRequiredParam("cid"); Channel chan = ChannelFactory.lookupByIdAndUser(cid, user); @@ -111,7 +111,7 @@ public class RepositoriesAction extends RhnAction implements Listable { * {@inheritDoc} */ public List<ContentSource> getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); return ChannelFactory.lookupContentSources(user.getOrg()); } } 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 e36c52f..890b367 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 @@ -52,7 +52,7 @@ public class SyncErrataAction extends RhnAction implements Listable { HttpServletResponse response) { RequestContext rc = new RequestContext(request); - User user = rc.getLoggedInUser(); + User user = rc.getCurrentUser(); Channel chan = ChannelManager.lookupByIdAndUser( rc.getRequiredParam(RequestContext.CID), user); @@ -87,7 +87,7 @@ public class SyncErrataAction extends RhnAction implements Listable { * {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Channel chan = ChannelManager.lookupByIdAndUser( context.getRequiredParam(RequestContext.CID), user); 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 185c191..d59fdbb 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 @@ -65,7 +65,7 @@ public class SyncErrataPackagesAction extends RhnAction implements Listable { HttpServletResponse response) { RequestContext rc = new RequestContext(request); - User user = rc.getLoggedInUser(); + User user = rc.getCurrentUser(); Channel chan = ChannelManager.lookupByIdAndUser( rc.getRequiredParam(RequestContext.CID), user); @@ -119,7 +119,7 @@ public class SyncErrataPackagesAction extends RhnAction implements Listable { * {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Channel chan = ChannelManager.lookupByIdAndUser( context.getRequiredParam(RequestContext.CID), user); String label = RhnSetDecl.ERRATA_TO_SYNC.createCustom( 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 162d960..a70ddc4 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 @@ -60,7 +60,7 @@ public class SyncRepositoriesAction extends RhnAction implements Listable { HttpServletResponse response) { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); long cid = context.getRequiredParam("cid"); Channel chan = ChannelFactory.lookupByIdAndUser(cid, user); @@ -166,7 +166,7 @@ public class SyncRepositoriesAction extends RhnAction implements Listable { * {@inheritDoc} */ public List<ContentSource> getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); long cid = context.getRequiredParam("cid"); Channel chan = ChannelFactory.lookupByIdAndUser(cid, user); return ChannelFactory.lookupContentSources(user.getOrg(), chan); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java index 8c9cda7..e156738 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDeleteAction.java @@ -41,7 +41,7 @@ public class RepoDeleteAction extends RhnAction { HttpServletResponse response) { RequestContext context = new RequestContext(request); ContentSource src = ChannelFactory.lookupContentSource( - context.getParamAsLong("id"), context.getLoggedInUser().getOrg()); + context.getParamAsLong("id"), context.getCurrentUser().getOrg()); request.setAttribute(RepoDetailsAction.LABEL, src.getLabel()); request.setAttribute(RepoDetailsAction.URL, src.getSourceUrl()); 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 b030731..2ddcd8f 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 @@ -144,7 +144,7 @@ public class RepoDetailsAction extends RhnAction { setupPopup(context); if (!createMode) { setupRepo(request, form, ChannelFactory.lookupContentSource( - context.getParamAsLong("id"), context.getLoggedInUser().getOrg())); + context.getParamAsLong("id"), context.getCurrentUser().getOrg())); } } @@ -189,13 +189,13 @@ public class RepoDetailsAction extends RhnAction { RequestContext context = new RequestContext(request); String url = form.getString(URL); String label = form.getString(LABEL); - Org org = context.getLoggedInUser().getOrg(); + Org org = context.getCurrentUser().getOrg(); BaseRepoCommand repoCmd = null; if (isCreateMode(request)) { repoCmd = new CreateRepoCommand(org); } else { - repoCmd = new EditRepoCommand(context.getLoggedInUser(), + repoCmd = new EditRepoCommand(context.getCurrentUser(), context.getParamAsLong(SOURCEID)); } 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 14cb0e0..16ab404 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 @@ -49,7 +49,7 @@ public class RepoListSetupAction extends RhnAction { request.setAttribute(mapping.getParameter(), Boolean.TRUE); RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); List<ContentSourceDto> result; result = RepoLister.getInstance().list(user); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/BaseSubscribeAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/BaseSubscribeAction.java index 4d84d02..8311b13 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/BaseSubscribeAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/BaseSubscribeAction.java @@ -97,7 +97,7 @@ public class BaseSubscribeAction extends RhnLookupDispatchAction { log.debug("unspecified()"); RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI()); ActionForward af = mapping.findForward(RhnHelper.DEFAULT_FORWARD); @@ -136,7 +136,7 @@ public class BaseSubscribeAction extends RhnLookupDispatchAction { log.debug("confirmUpdateBaseChannels()"); RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); List<ChildChannelPreservationDto> unmatched = new LinkedList<ChildChannelPreservationDto>(); @@ -305,7 +305,7 @@ public class BaseSubscribeAction extends RhnLookupDispatchAction { RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI()); String barSeparatedChannelIds = request.getParameter(BASE_CHANNEL_IDS); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java index 0d5f056..e1eeb4c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java @@ -62,7 +62,7 @@ public class ChildChannelAction extends RhnAction { HttpServletResponse response) throws Exception { RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); DynaActionForm daForm = (DynaActionForm)form; request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelConfirmAction.java index ab60b0b..fc63467 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelConfirmAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelConfirmAction.java @@ -68,7 +68,7 @@ public class ChildChannelConfirmAction extends RhnAction implements Listable { overallStart = System.currentTimeMillis(); RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); DynaActionForm daForm = (DynaActionForm)form; // First, find the channels the user chose to operate on, as stored 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 38f09c9..d89f80d 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 @@ -54,7 +54,7 @@ public class SelectChannelAction extends RhnListAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); return ChannelManager.getChannelsForSsm(user, null); } } 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 10af2cd..df405aa 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 @@ -80,7 +80,7 @@ public abstract class BaseSetOperateOnDiffAction extends RhnSetAction { log.debug("operateOnDiff called"); - User user = new RequestContext(request).getLoggedInUser(); + User user = new RequestContext(request).getCurrentUser(); // RhnSet originalSet = getSetDecl().get(user); RhnSet currentset = updateSet(request); diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnSelectedItemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnSelectedItemsAction.java index e5c4d31..14297ea 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnSelectedItemsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/common/BaseSetOperateOnSelectedItemsAction.java @@ -74,7 +74,7 @@ public abstract class BaseSetOperateOnSelectedItemsAction extends RhnSetAction { Map params = makeParamMap(formIn, request); RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); StrutsDelegate strutsDelegate = getStrutsDelegate(); 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 1e41f84..f52c2aa 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 @@ -120,7 +120,7 @@ public abstract class BaseAddFilesAction extends RhnAction { RequestContext ctx = new RequestContext(req); ConfigRevision cr = ConfigFileBuilder.getInstance().create( cff.toData(), - ctx.getLoggedInUser(), channel); + ctx.getCurrentUser(), channel); if (cr != null) { ConfigActionHelper.setupRequestAttributes(ctx, cr diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseRankChannels.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseRankChannels.java index 328c432..f9046ea 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseRankChannels.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/BaseRankChannels.java @@ -62,7 +62,7 @@ public abstract class BaseRankChannels extends RhnLookupDispatchAction { protected void setupWidget(RequestContext context, DynaActionForm form, RhnSet set) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); LinkedHashSet labelValues = new LinkedHashSet(); populateWidgetLabels(labelValues, context); for (Iterator itr = set.getElements().iterator(); itr.hasNext();) { @@ -151,7 +151,7 @@ public abstract class BaseRankChannels extends RhnLookupDispatchAction { Map map = new HashMap(); processParams(context, map); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); RhnSet set = getRhnSet(user); setup(context, (DynaActionForm)formIn, set); return getStrutsDelegate().forwardParams diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java index 04769cd..9ffc930 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigActionHelper.java @@ -146,7 +146,7 @@ public abstract class ConfigActionHelper { return null; } - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); return ConfigurationManager.getInstance().lookupConfigChannel(user, ccid); } @@ -167,7 +167,7 @@ public abstract class ConfigActionHelper { */ public static ConfigFile getFile(HttpServletRequest request) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long cfid = requestContext.getParamAsLong(FILE_ID); if (cfid != null) { return ConfigurationManager.getInstance().lookupConfigFile(user, cfid); @@ -191,7 +191,7 @@ public abstract class ConfigActionHelper { public static ConfigRevision getRevision(HttpServletRequest request, ConfigFile file) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long crid = requestContext.getParamAsLong(REVISION_ID); if (crid != null) { return ConfigurationManager.getInstance().lookupConfigRevision(user, crid); @@ -208,7 +208,7 @@ public abstract class ConfigActionHelper { public static ConfigRevision findRevision(HttpServletRequest req) { RequestContext requestContext = new RequestContext(req); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long crid = requestContext.getParamAsLong(REVISION_ID); ConfigRevision cr = null; diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java index bb9e2e1..cd11531 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java @@ -158,7 +158,7 @@ public class ConfigFileForm extends ScrubbingDynaActionForm { RequestContext requestContext = new RequestContext(request); - User u = requestContext.getLoggedInUser(); + User u = requestContext.getCurrentUser(); set(ConfigFileForm.REV_PATH, cr.getConfigFile().getConfigFileName().getPath()); if (cr.isSymlink() && cr.getConfigInfo().getTargetFileName() != null) { 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 06498d5..2d308a9 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 @@ -62,7 +62,7 @@ public abstract class BaseCopyToAction extends RhnAction { HttpServletResponse resp) throws Exception { RequestContext ctx = new RequestContext(req); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); //if its not submitted // ==> this is the first visit to this page // clear the 'dirty set' 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 d70bef4..3fffcbb 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 @@ -59,7 +59,7 @@ public class ChannelDeployConfirmAction extends RhnAction { HttpServletRequest request, HttpServletResponse response) throws Exception { RequestContext ctx = new RequestContext(request); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); ConfigChannel cc = setupLists(request, user); request.setAttribute(ListTagHelper.PARENT_URL, @@ -132,7 +132,7 @@ public class ChannelDeployConfirmAction extends RhnAction { } private boolean doScheduleDeploy(HttpServletRequest req, DynaActionForm form) { - User usr = new RequestContext(req).getLoggedInUser(); + User usr = new RequestContext(req).getCurrentUser(); RhnSet files = RhnSetDecl.CONFIG_CHANNEL_DEPLOY_REVISIONS.get(usr); if (files.size() == 0) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFileDeploySetup.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFileDeploySetup.java index d659f14..6851d17 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFileDeploySetup.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFileDeploySetup.java @@ -42,14 +42,14 @@ public class ChannelFileDeploySetup extends BaseSetListAction { } protected DataResult getDataResult(RequestContext rctx, PageControl pc) { - User usr = rctx.getLoggedInUser(); + User usr = rctx.getCurrentUser(); ConfigChannel cc = ConfigActionHelper.getChannel(rctx.getRequest()); return ConfigurationManager.getInstance().listCurrentFiles(usr, cc, pc); } protected void processRequestAttributes(RequestContext rctx) { if (!rctx.isSubmitted()) { - getSetDecl().clear(rctx.getLoggedInUser()); + getSetDecl().clear(rctx.getCurrentUser()); } super.processRequestAttributes(rctx); ConfigChannel cc = ConfigActionHelper.getChannel(rctx.getRequest()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFileDeploySubmit.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFileDeploySubmit.java index 989903c..ab2d705 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFileDeploySubmit.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFileDeploySubmit.java @@ -47,7 +47,7 @@ public class ChannelFileDeploySubmit extends BaseSetOperateOnSelectedItemsAction protected DataResult getDataResult( User user, ActionForm formIn, HttpServletRequest req) { RequestContext rctx = new RequestContext(req); - User usr = rctx.getLoggedInUser(); + User usr = rctx.getCurrentUser(); ConfigChannel cc = ConfigActionHelper.getChannel(rctx.getRequest()); return ConfigurationManager.getInstance().listCurrentFiles(usr, cc, null); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesImportSetup.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesImportSetup.java index 34e34f5..e13a97a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesImportSetup.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesImportSetup.java @@ -31,7 +31,7 @@ import com.redhat.rhn.manager.rhnset.RhnSetDecl; public class ChannelFilesImportSetup extends BaseSetListAction { protected DataResult getDataResult(RequestContext ctx, PageControl pc) { - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); ConfigChannel cc = ConfigActionHelper.getChannel(ctx.getRequest()); DataResult dr = ConfigurationManager.getInstance(). listFilesNotInChannel(user, cc, pc); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesListSetup.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesListSetup.java index 8d04edc..515cd71 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesListSetup.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesListSetup.java @@ -31,7 +31,7 @@ import com.redhat.rhn.manager.rhnset.RhnSetDecl; public class ChannelFilesListSetup extends BaseSetListAction { protected DataResult getDataResult(RequestContext ctx, PageControl pc) { - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); ConfigChannel cc = ConfigActionHelper.getChannel(ctx.getRequest()); DataResult dr = ConfigurationManager.getInstance(). listCurrentFiles(user, cc, pc); @@ -40,7 +40,7 @@ public class ChannelFilesListSetup extends BaseSetListAction { protected void processRequestAttributes(RequestContext rctx) { if (!rctx.isSubmitted()) { - getSetDecl().clear(rctx.getLoggedInUser()); + getSetDecl().clear(rctx.getCurrentUser()); } super.processRequestAttributes(rctx); ConfigChannel cc = ConfigActionHelper.getChannel(rctx.getRequest()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesListSubmit.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesListSubmit.java index 8eb8d41..1a105cc 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesListSubmit.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelFilesListSubmit.java @@ -72,7 +72,7 @@ public class ChannelFilesListSubmit extends BaseSetOperateOnSelectedItemsAction HttpServletResponse response) { ActionForward retval = operateOnSelectedSet(mapping, formIn, request, response, "setFilesToRemove"); - ConfigActionHelper.clearRhnSets(new RequestContext(request).getLoggedInUser()); + ConfigActionHelper.clearRhnSets(new RequestContext(request).getCurrentUser()); return retval; } /** 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 17e7991..52b765e 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 @@ -57,7 +57,7 @@ public class ChannelOverviewAction extends RhnAction { DynaActionForm daForm = (DynaActionForm)form; Map params = makeParamMap(request); RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); ConfigurationManager manager = ConfigurationManager.getInstance(); ConfigChannelCreationHelper helper = new ConfigChannelCreationHelper(); ConfigChannel cc = findChannel(daForm, request, helper); @@ -132,7 +132,7 @@ public class ChannelOverviewAction extends RhnAction { } if (cc.getId() != null) { - User u = ctx.getLoggedInUser(); + User u = ctx.getCurrentUser(); request.setAttribute(CHANNEL_SUMMARY, getSummary(u, cc)); } @@ -165,7 +165,7 @@ public class ChannelOverviewAction extends RhnAction { protected ConfigChannel findChannel(DynaActionForm form, HttpServletRequest request, ConfigChannelCreationHelper helper) { RequestContext ctx = new RequestContext(request); - User u = ctx.getLoggedInUser(); + User u = ctx.getCurrentUser(); ConfigChannel cc = ConfigActionHelper.getChannel(request); 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 df81619..5bd4bf2 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 @@ -116,7 +116,7 @@ public class ChannelOverviewTasks extends RhnAction { boolean chooseFiles, boolean chooseSystems) { RequestContext ctx = new RequestContext(req); - User usr = ctx.getLoggedInUser(); + User usr = ctx.getCurrentUser(); ConfigChannel cc = ConfigActionHelper.getChannel(req); ConfigurationManager mgr = ConfigurationManager.getInstance(); @@ -154,7 +154,7 @@ public class ChannelOverviewTasks extends RhnAction { ConfigurationManager mgr = ConfigurationManager.getInstance(); ConfigChannel cc = ConfigActionHelper.getChannel(req); - User usr = new RequestContext(req).getLoggedInUser(); + User usr = new RequestContext(req).getCurrentUser(); DataResult systems = mgr.listChannelSystems(usr, cc, null); DataResult revs = mgr.listCurrentFiles(usr, cc, null); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemDeploySetup.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemDeploySetup.java index b3b6897..50d7e0b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemDeploySetup.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemDeploySetup.java @@ -42,14 +42,14 @@ public class ChannelSystemDeploySetup extends BaseSetListAction { } protected DataResult getDataResult(RequestContext rctx, PageControl pc) { - User usr = rctx.getLoggedInUser(); + User usr = rctx.getCurrentUser(); ConfigChannel cc = ConfigActionHelper.getChannel(rctx.getRequest()); return ConfigurationManager.getInstance().listSystemInfoForChannel(usr, cc, pc); } protected void processRequestAttributes(RequestContext rctx) { if (!rctx.isSubmitted()) { - getSetDecl().clear(rctx.getLoggedInUser()); + getSetDecl().clear(rctx.getCurrentUser()); } super.processRequestAttributes(rctx); ConfigChannel cc = ConfigActionHelper.getChannel(rctx.getRequest()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemDeploySubmit.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemDeploySubmit.java index 179954e..130a8d5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemDeploySubmit.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemDeploySubmit.java @@ -45,7 +45,7 @@ public class ChannelSystemDeploySubmit extends BaseSetOperateOnSelectedItemsActi protected DataResult getDataResult(User user, ActionForm formIn, HttpServletRequest request) { - User usr = new RequestContext(request).getLoggedInUser(); + User usr = new RequestContext(request).getCurrentUser(); ConfigChannel cc = ConfigActionHelper.getChannel(request); return ConfigurationManager.getInstance().listSystemInfoForChannel(usr, cc, null); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemsListSetup.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemsListSetup.java index c2e63bd..6b24ca3 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemsListSetup.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemsListSetup.java @@ -50,7 +50,7 @@ public class ChannelSystemsListSetup extends BaseSetListAction { } protected DataResult getDataResult(RequestContext ctx, PageControl pc) { - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); ConfigChannel cc = ConfigActionHelper.getChannel(ctx.getRequest()); DataResult dr = ConfigurationManager.getInstance(). listSystemInfoForChannel(user, cc, pc); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemsListSubmit.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemsListSubmit.java index a0b81be..06a63ea 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemsListSubmit.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/ChannelSystemsListSubmit.java @@ -94,7 +94,7 @@ public class ChannelSystemsListSubmit extends BaseSetOperateOnSelectedItemsActio Map params = makeParamMap(formIn, request); operateOnSelectedSet(mapping, formIn, request, response, "unsubscribeSystems"); RequestContext requestContext = new RequestContext(request); - ConfigActionHelper.clearRhnSets(requestContext.getLoggedInUser()); + ConfigActionHelper.clearRhnSets(requestContext.getCurrentUser()); return getStrutsDelegate().forwardParams(mapping.findForward("success"), params); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/Copy2ChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/Copy2ChannelsAction.java index 3a9d80f..f02a393 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/Copy2ChannelsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/Copy2ChannelsAction.java @@ -39,7 +39,7 @@ public class Copy2ChannelsAction extends BaseCopyToAction { */ public List getData(HttpServletRequest req) { RequestContext ctx = new RequestContext(req); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); ConfigChannel cc = ConfigActionHelper.getChannel(req); ConfigurationManager cm = ConfigurationManager.getInstance(); return cm.listChannelsForCopy(user, cc, cc.getConfigChannelType().getLabel()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/Copy2SystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/Copy2SystemsAction.java index 61fa560..c81b690 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/Copy2SystemsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/Copy2SystemsAction.java @@ -38,7 +38,7 @@ public class Copy2SystemsAction extends BaseCopyToAction { */ public List getData(HttpServletRequest req) { RequestContext ctx = new RequestContext(req); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); ConfigurationManager cm = ConfigurationManager.getInstance(); return cm.listSystemsForCopy(user, null); } 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 49f985e..748ae10 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 @@ -46,7 +46,7 @@ public class DeleteChannelAction extends RhnAction { HttpServletResponse response) { RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); DynaActionForm daForm = (DynaActionForm)formIn; Map params = makeParamMap(request); @@ -72,7 +72,7 @@ public class DeleteChannelAction extends RhnAction { private void deleteChannel(HttpServletRequest request, ConfigChannel cc) { RequestContext requestContext = new RequestContext(request); - User u = requestContext.getLoggedInUser(); + User u = requestContext.getCurrentUser(); ConfigurationManager.getInstance().deleteConfigChannel(u, cc); } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/TargetSystemsListSetup.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/TargetSystemsListSetup.java index 56df936..7ad9a3c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/TargetSystemsListSetup.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/TargetSystemsListSetup.java @@ -52,7 +52,7 @@ public class TargetSystemsListSetup extends BaseSetListAction { ConfigChannel cc = ConfigActionHelper.getChannel(ctx.getRequest()); DataResult dr = ConfigurationManager.getInstance(). - listSystemsNotInChannel(ctx.getLoggedInUser(), cc, pc); + listSystemsNotInChannel(ctx.getCurrentUser(), cc, pc); return dr; } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/TargetSystemsListSubmit.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/TargetSystemsListSubmit.java index d529772..6d6ae5c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/TargetSystemsListSubmit.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/channel/TargetSystemsListSubmit.java @@ -53,7 +53,7 @@ public class TargetSystemsListSubmit extends BaseSetOperateOnSelectedItemsAction RequestContext ctx = new RequestContext(requestIn); ConfigChannel cc = ConfigActionHelper.getChannel(requestIn); DataResult dr = ConfigurationManager.getInstance(). - listSystemsNotInChannel(ctx.getLoggedInUser(), cc, null); + listSystemsNotInChannel(ctx.getCurrentUser(), cc, null); return dr; } @@ -97,7 +97,7 @@ public class TargetSystemsListSubmit extends BaseSetOperateOnSelectedItemsAction operateOnSelectedSet(mapping, form, request, response, "subscribeSystems"); //now some of the sets may be invalid, so delete them. RequestContext requestContext = new RequestContext(request); - ConfigActionHelper.clearRhnSets(requestContext.getLoggedInUser()); + ConfigActionHelper.clearRhnSets(requestContext.getCurrentUser()); return getStrutsDelegate().forwardParams(mapping.findForward("success"), params); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/BaseCopyConfigFileAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/BaseCopyConfigFileAction.java index 9e77070..52baa72 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/BaseCopyConfigFileAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/BaseCopyConfigFileAction.java @@ -44,7 +44,7 @@ public abstract class BaseCopyConfigFileAction extends BaseSetListAction { rctxIn.getRequest().setAttribute(TYPE_ATTR, getType()); super.processRequestAttributes(rctxIn); if (!rctxIn.isSubmitted()) { - getSetDecl().clear(rctxIn.getLoggedInUser()); + getSetDecl().clear(rctxIn.getCurrentUser()); } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareChannelAction.java index c681210..c5b3547 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareChannelAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareChannelAction.java @@ -36,7 +36,7 @@ public class CompareChannelAction extends BaseListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pcIn) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); ConfigurationManager cm = ConfigurationManager.getInstance(); return cm.listChannelsForFileCompare(user, pcIn); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareCopyAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareCopyAction.java index 3c4e715..6930dfc 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareCopyAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareCopyAction.java @@ -43,7 +43,7 @@ public class CompareCopyAction extends BaseListAction { */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pcIn) { HttpServletRequest request = rctxIn.getRequest(); - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); ConfigFile file = ConfigActionHelper.getFile(request); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareDeployedAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareDeployedAction.java index 7ebd156..748d5e5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareDeployedAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareDeployedAction.java @@ -46,7 +46,7 @@ public class CompareDeployedAction extends BaseSetListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pcIn) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); ConfigFile file = ConfigActionHelper.getFile(rctxIn.getRequest()); Long cfnid = file.getConfigFileName().getId(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareDeployedSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareDeployedSubmitAction.java index 16484f9..43a66d5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareDeployedSubmitAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareDeployedSubmitAction.java @@ -101,7 +101,7 @@ public class CompareDeployedSubmitAction extends RhnSetAction { RequestContext requestContext = new RequestContext(request); updateSet(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); //get the set from the database and then clear it. RhnSet set = RhnSetDecl.CONFIG_SYSTEMS.get(user); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareFileAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareFileAction.java index b73c534..c307598 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareFileAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareFileAction.java @@ -45,7 +45,7 @@ public class CompareFileAction extends BaseListAction { */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pcIn) { HttpServletRequest request = rctxIn.getRequest(); - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); ConfigChannel channel = ConfigActionHelper.getChannel(request); ConfigurationManager cm = ConfigurationManager.getInstance(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareRevisionAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareRevisionAction.java index 290a484..9c31400 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareRevisionAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CompareRevisionAction.java @@ -41,7 +41,7 @@ public class CompareRevisionAction extends BaseListAction { */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pcIn) { HttpServletRequest request = rctxIn.getRequest(); - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); ConfigFile file = ConfigActionHelper.getFile(request); ConfigRevision revision = ConfigActionHelper.getRevision(request, file); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileCentralAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileCentralAction.java index 1d07ee0..d39a3ce 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileCentralAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileCentralAction.java @@ -33,7 +33,7 @@ import com.redhat.rhn.manager.rhnset.RhnSetDecl; public class CopyFileCentralAction extends BaseCopyConfigFileAction { protected DataResult getDataResult(RequestContext rctxIn, PageControl pcIn) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); ConfigFile file = ConfigActionHelper.getFile(rctxIn.getRequest()); ConfigurationManager cm = ConfigurationManager.getInstance(); return cm.listChannelsForFileCopy(user, file, getLabel(), pcIn); @@ -52,7 +52,7 @@ public class CopyFileCentralAction extends BaseCopyConfigFileAction { * {@inheritDoc} */ protected String checkPreConditions(RequestContext rctxIn) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); if (!user.hasRole(RoleFactory.CONFIG_ADMIN)) { throw new PermissionException("Must be a config admin."); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileLocalAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileLocalAction.java index 5e81a3b..4734e96 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileLocalAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileLocalAction.java @@ -32,7 +32,7 @@ import com.redhat.rhn.manager.rhnset.RhnSetDecl; public class CopyFileLocalAction extends BaseCopyConfigFileAction { protected DataResult getDataResult(RequestContext rctxIn, PageControl pcIn) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); ConfigFile file = ConfigActionHelper.getFile(rctxIn.getRequest()); ConfigurationManager cm = ConfigurationManager.getInstance(); return cm.listSystemsForFileCopy(user, file.getConfigFileName().getId(), diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileLocalSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileLocalSubmitAction.java index 10e35d2..203cc70 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileLocalSubmitAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileLocalSubmitAction.java @@ -43,7 +43,7 @@ public class CopyFileLocalSubmitAction extends BaseCopyFileSubmitAction { ActionForm formIn, HttpServletRequest requestIn) { RequestContext ctx = new RequestContext(requestIn); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); ConfigFile file = ConfigActionHelper.getFile(ctx.getRequest()); ConfigurationManager cm = ConfigurationManager.getInstance(); return cm.listSystemsForFileCopy(user, file.getConfigFileName().getId(), diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileSandboxAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileSandboxAction.java index 6598abd..2faba1b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileSandboxAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileSandboxAction.java @@ -31,7 +31,7 @@ import com.redhat.rhn.manager.rhnset.RhnSetDecl; public class CopyFileSandboxAction extends BaseCopyConfigFileAction { protected DataResult getDataResult(RequestContext rctxIn, PageControl pcIn) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); ConfigFile file = ConfigActionHelper.getFile(rctxIn.getRequest()); ConfigurationManager cm = ConfigurationManager.getInstance(); return cm.listSystemsForFileCopy(user, file.getConfigFileName().getId(), diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileSandboxSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileSandboxSubmitAction.java index e567ee3..f71822f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileSandboxSubmitAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/CopyFileSandboxSubmitAction.java @@ -43,7 +43,7 @@ public class CopyFileSandboxSubmitAction extends BaseCopyFileSubmitAction { ActionForm formIn, HttpServletRequest requestIn) { RequestContext ctx = new RequestContext(requestIn); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); ConfigFile file = ConfigActionHelper.getFile(ctx.getRequest()); ConfigurationManager cm = ConfigurationManager.getInstance(); return cm.listSystemsForFileCopy(user, file.getConfigFileName().getId(), 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 98bedf7..26a762b 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 @@ -48,7 +48,7 @@ public class DeleteFileAction extends RhnAction { HttpServletRequest req, HttpServletResponse resp) throws Exception { RequestContext ctx = new RequestContext(req); - User usr = ctx.getLoggedInUser(); + User usr = ctx.getCurrentUser(); Map params = makeParamMap(req); ConfigFileForm cff = (ConfigFileForm)form; 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 b1b6c33..265daca 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 @@ -59,7 +59,7 @@ public class DeleteRevisionAction extends RhnAction { try { if (cr != null) { if (isSubmitted(cff)) { - User u = ctx.getLoggedInUser(); + User u = ctx.getCurrentUser(); boolean deletedFile = ConfigurationManager.getInstance().deleteConfigRevision(u, cr); //now that the config revision is gone, some of the sets may no diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DiffAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DiffAction.java index e6ec2d7..30aaf7c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DiffAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DiffAction.java @@ -50,7 +50,7 @@ public class DiffAction extends RhnAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long ocrid = requestContext.getRequiredParam("ocrid"); String view = request.getParameter("view"); if (view == null) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DownloadDiffAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DownloadDiffAction.java index c3f5d95..fd8a1ea 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DownloadDiffAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/DownloadDiffAction.java @@ -52,7 +52,7 @@ public class DownloadDiffAction extends RhnAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long ocrid = requestContext.getRequiredParam("ocrid"); //Get the objects. 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 07dbe9d..f5fab5e 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 @@ -79,7 +79,7 @@ public class FileDetailsAction extends RhnAction { ConfigFileBuilder builder = ConfigFileBuilder.getInstance(); try { cr = builder.update(cff.toRevisedData(cr), - context.getLoggedInUser(), cr.getConfigFile()); + context.getCurrentUser(), cr.getConfigFile()); params.put("crid", cr.getId().toString()); } catch (ValidatorException ve) { @@ -109,7 +109,7 @@ public class FileDetailsAction extends RhnAction { if (!cr.isDirectory()) { totalBytes = ConfigurationManager.getInstance(). - getFileStorage(ctx.getLoggedInUser(), cr.getConfigFile()); + getFileStorage(ctx.getCurrentUser(), cr.getConfigFile()); } request.setAttribute(CSRF_TOKEN, diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeployConfirmSetup.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeployConfirmSetup.java index e9107f9..f5f0680 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeployConfirmSetup.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeployConfirmSetup.java @@ -39,7 +39,7 @@ public class GlobalRevisionDeployConfirmSetup extends BaseListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext ctx, PageControl pc) { - User usr = ctx.getLoggedInUser(); + User usr = ctx.getCurrentUser(); ConfigFile cf = ConfigActionHelper.getFile(ctx.getRequest()); ConfigChannel cc = cf.getConfigChannel(); DataResult dr = ConfigurationManager.getInstance(). diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeployConfirmSubmit.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeployConfirmSubmit.java index 6bc0879..e428f04 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeployConfirmSubmit.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeployConfirmSubmit.java @@ -82,7 +82,7 @@ public class GlobalRevisionDeployConfirmSubmit extends RhnListDispatchAction { RequestContext requestContext = new RequestContext(request); //schedule diff actions - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); ConfigRevision cr = ConfigActionHelper.findRevision(request); RhnSet systems = RhnSetDecl.CONFIG_FILE_DEPLOY_SYSTEMS.get(user); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeploySetup.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeploySetup.java index 5bb830c..3c7c699 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeploySetup.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeploySetup.java @@ -32,7 +32,7 @@ import com.redhat.rhn.manager.rhnset.RhnSetDecl; public class GlobalRevisionDeploySetup extends BaseSetListAction { protected DataResult getDataResult(RequestContext ctx, PageControl pc) { - User usr = ctx.getLoggedInUser(); + User usr = ctx.getCurrentUser(); ConfigFile cf = ConfigActionHelper.getFile(ctx.getRequest()); ConfigChannel cc = cf.getConfigChannel(); DataResult dr = ConfigurationManager.getInstance(). diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeploySubmit.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeploySubmit.java index 27f45ac..0755615 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeploySubmit.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeploySubmit.java @@ -47,7 +47,7 @@ public class GlobalRevisionDeploySubmit extends BaseSetOperateOnSelectedItemsAct protected DataResult getDataResult(User user, ActionForm formIn, HttpServletRequest request) { RequestContext ctx = new RequestContext(request); - User usr = ctx.getLoggedInUser(); + User usr = ctx.getCurrentUser(); ConfigFile cf = ConfigActionHelper.getFile(ctx.getRequest()); ConfigChannel cc = cf.getConfigChannel(); DataResult dr = ConfigurationManager.getInstance(). 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 6df09f2..e438900 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 @@ -67,7 +67,7 @@ public class LocalRevisionDeployAction extends RhnAction { ConfigActionHelper.processParamMap(request, params); DynaActionForm dForm = (DynaActionForm) form; - User usr = requestContext.getLoggedInUser(); + User usr = requestContext.getCurrentUser(); ConfigRevision cr = ConfigActionHelper.findRevision(request); @@ -101,7 +101,7 @@ public class LocalRevisionDeployAction extends RhnAction { RequestContext requestContext = new RequestContext(request); Server srv = null; - User usr = requestContext.getLoggedInUser(); + User usr = requestContext.getCurrentUser(); ConfigFile cf = cr.getConfigFile(); ConfigChannel cc = cf.getConfigChannel(); if (cc.isLocalChannel() || cc.isSandboxChannel()) { @@ -118,7 +118,7 @@ public class LocalRevisionDeployAction extends RhnAction { Server srv) { RequestContext requestContext = new RequestContext(request); - User usr = requestContext.getLoggedInUser(); + User usr = requestContext.getCurrentUser(); ConfigFile cf = cr.getConfigFile(); ConfigChannel cc = cf.getConfigChannel(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSetup.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSetup.java index 5bd19fa..611bdc1 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSetup.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSetup.java @@ -58,7 +58,7 @@ public class ManageRevisionSetup extends BaseSetListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pcIn) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); ConfigFile file = ConfigActionHelper.getFile(rctxIn.getRequest()); ConfigActionHelper.processRequestAttributes(rctxIn); return ConfigurationManager.getInstance().listRevisionsForFile(user, file, pcIn); 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 bf47fe7..e7f18e2 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 @@ -127,7 +127,7 @@ public class ManageRevisionSubmit extends RhnSetAction { ActionForward forward = deleteRevisions(request, form, mapping, set); //now some of the sets may be invalid, so delete them. - ConfigActionHelper.clearRhnSets(requestContext.getLoggedInUser()); + ConfigActionHelper.clearRhnSets(requestContext.getCurrentUser()); return forward; } @@ -148,7 +148,7 @@ public class ManageRevisionSubmit extends RhnSetAction { checkAcl(requestContext); Long cfid = requestContext.getRequiredParam(ConfigActionHelper.FILE_ID); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); //get a connection to the file stream ConfigFileForm cff = (ConfigFileForm)form; @@ -197,7 +197,7 @@ public class ManageRevisionSubmit extends RhnSetAction { //if it gets deleted, we can still go to the right config channel //and refer to the correct file path. ConfigFile file = ConfigActionHelper.getFile(request); - User user = new RequestContext(request).getLoggedInUser(); + User user = new RequestContext(request).getCurrentUser(); Map params = makeParamMap(form, request); StrutsDelegate strutsDelegate = getStrutsDelegate(); @@ -293,7 +293,7 @@ public class ManageRevisionSubmit extends RhnSetAction { private void checkAcl(RequestContext requestContext) { //Throws an exception if the user does not have permission to edit the channel. - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); ConfigFile configFile = ConfigActionHelper.getFile(requestContext.getRequest()); boolean acl = AclManager.hasAcl("config_channel_editable(" + configFile.getConfigChannel().getId() + ")", 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 ad79e19..c750148 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 @@ -46,7 +46,7 @@ public class GlobalConfigChannelList extends RhnListAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); PageControl pc = new PageControl(); pc.setFilterColumn("name"); pc.setFilter(true); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/GlobalConfigFileList.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/GlobalConfigFileList.java index e29d00d..584419a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/GlobalConfigFileList.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/GlobalConfigFileList.java @@ -28,7 +28,7 @@ import com.redhat.rhn.manager.configuration.ConfigurationManager; public class GlobalConfigFileList extends BaseListAction { protected DataResult getDataResult(RequestContext context, PageControl pc) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult dr = ConfigurationManager.getInstance().listGlobalConfigFiles(user, pc); return dr; } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/LocalConfigFileList.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/LocalConfigFileList.java index 625186a..f2a8435 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/LocalConfigFileList.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/LocalConfigFileList.java @@ -34,7 +34,7 @@ public class LocalConfigFileList extends BaseListAction { } protected DataResult getDataResult(RequestContext context, PageControl pc) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult dr = ConfigurationManager.getInstance().listLocalConfigFiles(user, pc); return dr; } 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 b9161ee..685dc2a 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 @@ -45,7 +45,7 @@ public class ManagedSystemsList extends RhnListAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); PageControl pc = new PageControl(); pc.setFilterColumn("name"); pc.setFilter(true); 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 c094738..32a3ccd 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 @@ -46,7 +46,7 @@ public class Overview extends RhnAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); ConfigurationManager manager = ConfigurationManager.getInstance(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/TargetSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/TargetSystemsAction.java index e528232..555b087 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/TargetSystemsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/TargetSystemsAction.java @@ -51,7 +51,7 @@ public class TargetSystemsAction extends RhnListAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); PageControl pc = new PageControl(); pc.setFilterColumn("name"); pc.setFilter(true); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/TargetSystemsSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/TargetSystemsSubmitAction.java index 104c64a..6857c1a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/TargetSystemsSubmitAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/overview/TargetSystemsSubmitAction.java @@ -89,7 +89,7 @@ public class TargetSystemsSubmitAction extends RhnSetAction { HttpServletResponse response) { updateSet(request); RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); //get the earliest date for package actions. DynaActionForm form = (DynaActionForm) formIn; diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ChannelListAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ChannelListAction.java index 59c6b7c..804654a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ChannelListAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ChannelListAction.java @@ -34,7 +34,7 @@ public class ChannelListAction extends BaseSetListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pc) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); Server server = rctxIn.lookupAndBindServer(); SdcHelper.ssmCheck(rctxIn.getRequest(), server.getId(), user); return ConfigurationManager.getInstance().listChannelsForSystem(user, server, pc); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListConfirmSetupAction.java index c8841d5..a2013ae 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListConfirmSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListConfirmSetupAction.java @@ -41,7 +41,7 @@ public class FileListConfirmSetupAction extends BaseListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pcIn) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); Server server = rctxIn.lookupAndBindServer(); // if a var called selectall=true is bound, then do a select all String selectAll = rctxIn.getParam(SELECT_ALL, false); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListConfirmSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListConfirmSubmitAction.java index 2abf0ba..0c8e710 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListConfirmSubmitAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListConfirmSubmitAction.java @@ -87,7 +87,7 @@ public class FileListConfirmSubmitAction extends RhnListDispatchAction { public ActionForward importFile(ActionMapping mapping, ActionForm formIn, HttpServletRequest request, HttpServletResponse response) { RequestContext ctxt = new RequestContext(request); - User user = ctxt.getLoggedInUser(); + User user = ctxt.getCurrentUser(); Server server = ctxt.lookupServer(); //The set of config file names to add to the action. @@ -150,7 +150,7 @@ public class FileListConfirmSubmitAction extends RhnListDispatchAction { private ActionForward createRevisionAction(HttpServletRequest request, ActionForm form, ActionMapping mapping, ActionType type, String successKey) { RequestContext ctxt = new RequestContext(request); - User user = ctxt.getLoggedInUser(); + User user = ctxt.getCurrentUser(); Long sid = ctxt.getRequiredParam("sid"); //create a set of config revisions from the set of config file names diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListSetupAction.java index 7360434..1cb17ef 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListSetupAction.java @@ -44,7 +44,7 @@ public class FileListSetupAction extends BaseSetListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pc) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); Server server = rctxIn.lookupAndBindServer(); return ConfigurationManager.getInstance().listFileNamesForSystem(user, server, pc); } @@ -57,12 +57,12 @@ public class FileListSetupAction extends BaseSetListAction { protected void processRequestAttributes(RequestContext rctxIn) { super.processRequestAttributes(rctxIn); rctxIn.lookupAndBindServer(); - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); Server server = rctxIn.lookupAndBindServer(); SdcHelper.ssmCheck(rctxIn.getRequest(), server.getId(), user); if (!rctxIn.isSubmitted()) { - RhnSet set = getSetDecl().get(rctxIn.getLoggedInUser()); + RhnSet set = getSetDecl().get(rctxIn.getCurrentUser()); set.clear(); RhnSetManager.store(set); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ImportFileAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ImportFileAction.java index 0112147..17f098b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ImportFileAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ImportFileAction.java @@ -35,18 +35,18 @@ public class ImportFileAction extends BaseSetListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctx, PageControl pc) { - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); Server server = rctx.lookupServer(); return ConfigurationManager.getInstance().listFileNamesForSystem(user, server, pc); } protected void processRequestAttributes(RequestContext rctx) { if (!rctx.isSubmitted()) { - getSetDecl().clear(rctx.getLoggedInUser()); + getSetDecl().clear(rctx.getCurrentUser()); } super.processRequestAttributes(rctx); Server server = rctx.lookupAndBindServer(); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); SdcHelper.ssmCheck(rctx.getRequest(), server.getId(), user); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ImportFileSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ImportFileSubmitAction.java index 856ceea..ecf53e3 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ImportFileSubmitAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ImportFileSubmitAction.java @@ -130,7 +130,7 @@ public class ImportFileSubmitAction extends RhnSetAction { * @return whether there were errors. */ private boolean readTextBox(ActionForm formIn, HttpServletRequest request) { - User user = new RequestContext(request).getLoggedInUser(); + User user = new RequestContext(request).getCurrentUser(); DynaActionForm form = (DynaActionForm) formIn; String[] names = form.getString("contents").split("\n"); @@ -173,7 +173,7 @@ public class ImportFileSubmitAction extends RhnSetAction { } private int importSelected(HttpServletRequest request) { - User user = new RequestContext(request).getLoggedInUser(); + User user = new RequestContext(request).getCurrentUser(); //note that the set could already be populated by the text box RhnSet importSet = RhnSetDecl.CONFIG_IMPORT_FILE_NAMES.get(user); RhnSet selectedSet = updateSet(request); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/LocalAddFileAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/LocalAddFileAction.java index 66582b5..2361ab0 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/LocalAddFileAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/LocalAddFileAction.java @@ -46,7 +46,7 @@ public class LocalAddFileAction extends BaseAddFilesAction { protected void processRequest(HttpServletRequest request) { RequestContext ctx = new RequestContext(request); Server server = ctx.lookupAndBindServer(); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); SdcHelper.ssmCheck(request, server.getId(), user); } 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 12fa19e..1a09d04 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 @@ -103,7 +103,7 @@ public class OverviewAction extends RhnAction { HttpServletResponse response) { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Server server = context.lookupAndBindServer(); ConfigurationManager cm = ConfigurationManager.getInstance(); @@ -170,7 +170,7 @@ public class OverviewAction extends RhnAction { Server server = context.lookupAndBindServer(); HttpServletRequest request = context.getRequest(); LocalizationService service = LocalizationService.getInstance(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); /** * Do the diff action. */ @@ -212,7 +212,7 @@ public class OverviewAction extends RhnAction { Server server = context.lookupAndBindServer(); HttpServletRequest request = context.getRequest(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); ConfigAction ca = (ConfigAction)ActionManager.lookupLastCompletedAction(user, ActionFactory.TYPE_CONFIGFILES_DEPLOY, @@ -373,7 +373,7 @@ public class OverviewAction extends RhnAction { private void setupConfigEnablementInfo(RequestContext context) { Server server = context.lookupAndBindServer(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); ConfigurationManager cm = ConfigurationManager.getInstance(); context.getRequest().setAttribute(CONFIG_ENABLED, cm.isConfigEnabled(server, user)); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/RankChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/RankChannelsAction.java index 8eb51f1..700f282 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/RankChannelsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/RankChannelsAction.java @@ -68,7 +68,7 @@ public class RankChannelsAction extends BaseRankChannels { ActionForm form, HttpServletRequest request, HttpServletResponse response) { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); RhnSet set = getRhnSet(user); SdcHelper.ssmCheck(request, context.lookupAndBindServer().getId(), user); setup(context, (DynaActionForm)form, set); @@ -93,7 +93,7 @@ public class RankChannelsAction extends BaseRankChannels { return handleNoScript(mapping, formIn, request, response); } - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DynaActionForm form = (DynaActionForm) formIn; Server server = context.lookupAndBindServer(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/SDCCopy2ChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/SDCCopy2ChannelsAction.java index 34c2687..f2c9ad9 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/SDCCopy2ChannelsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/SDCCopy2ChannelsAction.java @@ -77,7 +77,7 @@ public class SDCCopy2ChannelsAction extends Copy2ChannelsAction { */ public List getData(HttpServletRequest req) { RequestContext ctx = new RequestContext(req); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); ConfigurationManager cm = ConfigurationManager.getInstance(); DataResult rs = cm.listGlobalChannels(user, null); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/SubscriptionsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/SubscriptionsSetupAction.java index 7a3fc5e..f0f23b8 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/SubscriptionsSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/SubscriptionsSetupAction.java @@ -42,7 +42,7 @@ public class SubscriptionsSetupAction extends BaseSetListAction { */ protected void processRequestAttributes(RequestContext rctx) { if (!rctx.isSubmitted()) { - getSetDecl().clear(rctx.getLoggedInUser()); + getSetDecl().clear(rctx.getCurrentUser()); } super.processRequestAttributes(rctx); return; @@ -52,7 +52,7 @@ public class SubscriptionsSetupAction extends BaseSetListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext context, PageControl pc) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); ConfigurationManager cm = ConfigurationManager.getInstance(); Server server = context.lookupAndBindServer(); SdcHelper.ssmCheck(context.getRequest(), server.getId(), user); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ViewModifyPathsAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ViewModifyPathsAction.java index d2acaa2..97ee82e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ViewModifyPathsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ViewModifyPathsAction.java @@ -104,7 +104,7 @@ public class ViewModifyPathsAction extends RhnAction implements Listable { SdcHelper.ssmCheck(request, context.lookupAndBindServer().getId(), - context.getLoggedInUser()); + context.getCurrentUser()); return mapping.findForward(RhnHelper.DEFAULT_FORWARD); } @@ -123,7 +123,7 @@ public class ViewModifyPathsAction extends RhnAction implements Listable { ActionMapping mapping, RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Server server = context.lookupAndBindServer(); String action = COPY_TO_GLOBAL; Map params = new HashMap(); @@ -292,7 +292,7 @@ public class ViewModifyPathsAction extends RhnAction implements Listable { */ public List getResult(RequestContext context) { Server server = context.lookupAndBindServer(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); ConfigChannelType type = (ConfigChannelType) context.getRequest().getAttribute(TYPE); ConfigurationManager cm = ConfigurationManager.getInstance(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ChannelSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ChannelSystemsAction.java index 9298ed9..453b8f7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ChannelSystemsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ChannelSystemsAction.java @@ -34,7 +34,7 @@ public class ChannelSystemsAction extends BaseListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pc) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); Long ccid = rctxIn.getRequiredParam("ccid"); ConfigurationManager cm = ConfigurationManager.getInstance(); @@ -48,7 +48,7 @@ public class ChannelSystemsAction extends BaseListAction { */ protected void processRequestAttributes(RequestContext rctxIn) { HttpServletRequest request = rctxIn.getRequest(); - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); Long ccid = rctxIn.getRequiredParam("ccid"); ConfigChannel channel = diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ConfigConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ConfigConfirmAction.java index bed70a7..4fb58ec 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ConfigConfirmAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ConfigConfirmAction.java @@ -36,14 +36,14 @@ public class ConfigConfirmAction extends BaseListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pcIn) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); String feature = rctxIn.getRequest().getParameter("feature"); return ConfigurationManager.getInstance().listSystemsForConfigAction(user, pcIn, feature); } protected void processRequestAttributes(RequestContext rctxIn) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); int size = RhnSetDecl.CONFIG_FILE_NAMES.get(user).size(); rctxIn.getRequest().setAttribute("filenum", new Integer(size)); super.processRequestAttributes(rctxIn); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ConfigConfirmSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ConfigConfirmSubmitAction.java index 6adb95a..d9e6ebc 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ConfigConfirmSubmitAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ConfigConfirmSubmitAction.java @@ -115,7 +115,7 @@ public class ConfigConfirmSubmitAction extends RhnListDispatchAction { RequestContext requestContext = new RequestContext(request); //schedule diff actions - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); ConfigurationManager cm = ConfigurationManager.getInstance(); DataResult<ConfigSystemDto> systems = cm.listSystemsForConfigAction(user, null, diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ConfigListAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ConfigListAction.java index 04ce252..650068c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ConfigListAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/ConfigListAction.java @@ -39,7 +39,7 @@ public class ConfigListAction extends BaseSetListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pcIn) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); return ConfigurationManager.getInstance().listFileNamesForSsm(user, pcIn); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/DiffFilesAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/DiffFilesAction.java index cb623d9..76f1b79 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/DiffFilesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/DiffFilesAction.java @@ -37,7 +37,7 @@ public class DiffFilesAction extends BaseListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pc) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); Server server = rctxIn.lookupServer(); DataResult dr = ConfigurationManager.getInstance() @@ -51,7 +51,7 @@ public class DiffFilesAction extends BaseListAction { */ protected void processRequestAttributes(RequestContext rctxIn) { HttpServletRequest request = rctxIn.getRequest(); - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); Server server = rctxIn.lookupAndBindServer(); RhnSet set = RhnSetDecl.CONFIG_FILE_NAMES.get(user); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/DiffSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/DiffSystemsAction.java index 92cfd28..8a45c37 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/DiffSystemsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/DiffSystemsAction.java @@ -33,7 +33,7 @@ public class DiffSystemsAction extends BaseListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pc) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); Long cfnid = rctxIn.getRequiredParam("cfnid"); return ConfigurationManager.getInstance().listSystemsForFileName(user, cfnid, pc); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/EnableListAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/EnableListAction.java index 891f172..9697f6b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/EnableListAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/EnableListAction.java @@ -51,7 +51,7 @@ public class EnableListAction extends RhnListAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); PageControl pc = new PageControl(); pc.setFilter(true); pc.setFilterColumn("name"); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/EnableSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/EnableSubmitAction.java index 3285e8e..b0b9cda 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/EnableSubmitAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/EnableSubmitAction.java @@ -67,7 +67,7 @@ public class EnableSubmitAction extends RhnListDispatchAction { ActionForm formIn, HttpServletRequest request, HttpServletResponse response) { - User user = new RequestContext(request).getLoggedInUser(); + User user = new RequestContext(request).getCurrentUser(); RhnSetDecl set = RhnSetDecl.SYSTEMS; //get the earliest schedule for package install actions. diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/RankChannels.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/RankChannels.java index 5e31e97..079270e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/RankChannels.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/RankChannels.java @@ -60,7 +60,7 @@ public class RankChannels extends BaseRankChannels { ActionForm form, HttpServletRequest request, HttpServletResponse response) { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); RhnSet set = getRhnSet(user); setup(context, (DynaActionForm)form, set); @@ -83,7 +83,7 @@ public class RankChannels extends BaseRankChannels { return handleNoScript(mapping, formIn, request, response); } String position = ((DynaActionForm)formIn).getString(PRIORITY); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DynaActionForm form = (DynaActionForm) formIn; RhnSet set = getRhnSet(user); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java index c3362d5..1186a14 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeConfirm.java @@ -73,7 +73,7 @@ public class SubscribeConfirm extends RhnAction { //typical stuff RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); //Decide whether we are visiting the same page or //performing the subscribe. diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeSetup.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeSetup.java index 87b30b0..7e8252b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeSetup.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeSetup.java @@ -51,7 +51,7 @@ public class SubscribeSetup extends RhnListAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); PageControl pc = new PageControl(); clampListBounds(pc, request, user); pc.setFilter(true); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeSubmit.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeSubmit.java index 3f35153..8814fa8 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeSubmit.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeSubmit.java @@ -100,7 +100,7 @@ public class SubscribeSubmit extends BaseSetOperateOnSelectedItemsAction { process on the next page, so need to add in those omitted channels explicitly so they take place in the ranking. */ - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); ConfigurationManager manager = ConfigurationManager.getInstance(); DataResult channels = manager.ssmChannelListForSubscribeAlreadySubbed(user); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SummaryAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SummaryAction.java index c3dbd96..b8b8a16 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SummaryAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SummaryAction.java @@ -32,7 +32,7 @@ public class SummaryAction extends BaseListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pcIn) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); ConfigurationManager cm = ConfigurationManager.getInstance(); return cm.getEnableSummary(user, pcIn, RhnSetDecl.CONFIG_ENABLE_SYSTEMS.getLabel()); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SystemChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SystemChannelsAction.java index 73f576d..2ceb554 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SystemChannelsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SystemChannelsAction.java @@ -32,7 +32,7 @@ public class SystemChannelsAction extends BaseListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pc) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); ConfigurationManager cm = ConfigurationManager.getInstance(); Server server = rctxIn.lookupServer(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeAction.java index 3cae8f5..009f071 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeAction.java @@ -39,7 +39,7 @@ public class UnsubscribeAction extends BaseSetListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pcIn) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); return ConfigurationManager.getInstance().ssmChannelList(user, pcIn); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeConfirmAction.java index f704da7..21b091c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeConfirmAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeConfirmAction.java @@ -31,7 +31,7 @@ public class UnsubscribeConfirmAction extends BaseListAction { * {@inheritDoc} */ protected DataResult getDataResult(RequestContext rctxIn, PageControl pcIn) { - User user = rctxIn.getLoggedInUser(); + User user = rctxIn.getCurrentUser(); return ConfigurationManager.getInstance().ssmSystemListForChannels(user, pcIn); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeConfirmSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeConfirmSubmitAction.java index c05e148..49af37b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeConfirmSubmitAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/UnsubscribeConfirmSubmitAction.java @@ -73,7 +73,7 @@ public class UnsubscribeConfirmSubmitAction extends RhnListDispatchAction { */ public ActionForward confirm(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { - User user = new RequestContext(request).getLoggedInUser(); + User user = new RequestContext(request).getCurrentUser(); RhnSet channelSet = RhnSetDecl.CONFIG_CHANNELS.get(user); ConfigurationManager cm = ConfigurationManager.getInstance(); DataResult systemSet = cm.ssmSystemListForChannels(user, null); 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 441853f..f95bec3 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 @@ -99,7 +99,7 @@ public class AddPackagesAction extends RhnAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext context) { HttpServletRequest request = context.getRequest(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); // Put the advisory into the request for the page header Errata errata = new RequestContext(request).lookupErratum(); 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 6fd906d..6f6fa30 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 @@ -85,7 +85,7 @@ public class AddPackagesConfirmAction extends RhnAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); HttpServletRequest request = context.getRequest(); Map<String, Object> params = new HashMap<String, Object>(); @@ -119,7 +119,7 @@ public class AddPackagesConfirmAction extends RhnAction implements Listable { StrutsDelegate strutsDelegate = getStrutsDelegate(); // Get the Logged in user and the errata in question - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Errata errata = requestContext.lookupErratum(); // Retrieve the set containing the ids of the packages we want to add 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 b6ed2fd..2b21af1 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 @@ -53,7 +53,7 @@ public class AffectedSystemsSetupAction extends RhnListAction { RequestContext requestContext = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Errata errata = requestContext.lookupErratum(); 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 b341936..9c94322 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 @@ -44,7 +44,7 @@ public abstract class BaseDeleteErrataAction extends RhnAction { HttpServletResponse response) { RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); deleteErrata(user); RhnSet set = RhnSetDecl.ERRATA_TO_DELETE.get(user); 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 e11a80d..44b0b70 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 @@ -41,7 +41,7 @@ public abstract class BaseErrataListSetupAction extends RhnListAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); PageControl pc = new PageControl(); clampListBounds(pc, request, user); diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListAllAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListAllAction.java index 5041ba9..2ab3106 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListAllAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListAllAction.java @@ -30,7 +30,7 @@ public class BugErrataListAllAction extends ErrataListAllAction { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); return ErrataManager.allErrataByType(user, ErrataFactory.ERRATA_TYPE_BUG); } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListRelevantAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListRelevantAction.java index 0a5fd98..aed9a41 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListRelevantAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/BugErrataListRelevantAction.java @@ -31,7 +31,7 @@ public class BugErrataListRelevantAction extends ErrataListRelevantAction { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); return ErrataManager.relevantErrataByType(user, null, ErrataFactory.ERRATA_TYPE_BUG); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ChannelAction.java index a73b461..0de8fb8 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/ChannelAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ChannelAction.java @@ -76,7 +76,7 @@ public class ChannelAction extends RhnSetAction { RequestContext requestContext = new RequestContext(request); //Get the logged in user - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); //Get the errata object Errata errata = requestContext.lookupErratum(); @@ -112,7 +112,7 @@ public class ChannelAction extends RhnSetAction { HttpServletResponse response) { log.debug("updateChannels called."); RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); //Get the errata object Errata errata = requestContext.lookupErratum(); 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 b08f3e0..e613837 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 @@ -59,7 +59,7 @@ public class ChannelSetupAction extends RhnListAction { RequestContext requestContext = new RequestContext(request); //get the user and page control - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); PageControl pc = new PageControl(); clampListBounds(pc, request, user); 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 f33efe7..ec5ecd8 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 @@ -49,7 +49,7 @@ public class CloneConfirmAction extends RhnAction { HttpServletResponse response) { RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); DataResult dr = ErrataManager.selectedForCloning(user, null); 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 fa6c444..6ee7f71 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 @@ -77,7 +77,7 @@ public class CloneErrataAction extends RhnAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Long orgId = user.getOrg().getId(); // Determine if a specific channel is being selected diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/CreateAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/CreateAction.java index 15e546e..79d5637 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/CreateAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/CreateAction.java @@ -123,7 +123,7 @@ public class CreateAction extends RhnAction { e.setUpdateDate(date); //Set the org for the errata to the logged in user's org - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); e.setOrg(user.getOrg()); ErrataManager.storeErrata(e); 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 85bfadf..2b529e4 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 @@ -83,7 +83,7 @@ public class DeleteErratumAction extends LookupDispatchAction { RequestContext requestContext = new RequestContext(request); Errata errata = requestContext.lookupErratum(); - ErrataManager.deleteErratum(requestContext.getLoggedInUser(), errata); + ErrataManager.deleteErratum(requestContext.getCurrentUser(), errata); ActionMessages msgs = new ActionMessages(); msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("erratum.delete", errata.getAdvisoryName())); diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListAllAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListAllAction.java index f46a1d6..79d318f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListAllAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListAllAction.java @@ -31,7 +31,7 @@ public class EnhancementErrataListAllAction extends ErrataListAllAction { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); return ErrataManager.allErrataByType(user, ErrataFactory.ERRATA_TYPE_ENHANCEMENT); } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListRelevantAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListRelevantAction.java index 4f2d0a8..e50a299 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListRelevantAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/EnhancementErrataListRelevantAction.java @@ -32,7 +32,7 @@ public class EnhancementErrataListRelevantAction extends /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); return ErrataManager.relevantErrataByType(user, null, ErrataFactory.ERRATA_TYPE_ENHANCEMENT); } 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 610224c..63fc7ab 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 @@ -86,7 +86,7 @@ public class ErrataConfirmAction extends RhnListDispatchAction { RequestContext requestContext = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); DynaActionForm form = (DynaActionForm) formIn; Errata currentErrata = requestContext.lookupErratum(); 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 19fa1b3..e9f9644 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 @@ -46,7 +46,7 @@ public class ErrataConfirmSetupAction extends RhnListAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); PageControl pc = new PageControl(); clampListBounds(pc, request, user); 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 1967e98..feb89f5 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 @@ -50,7 +50,7 @@ public class ErrataDetailsSetupAction extends RhnAction { Long eid = requestContext.getRequiredParam("eid"); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Errata errata = ErrataManager.lookupErrata(eid, user); String ovalFile = findOvalFile(errata.getId()); DataResult channels = ErrataManager.affectedChannels(user, eid); 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 1244928..ae58343 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 @@ -63,7 +63,7 @@ public abstract class ErrataListBaseAction extends RhnAction implements Listable /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult result; switch (getErrataFilter()) { 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 ac542e9..22b3c83 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 @@ -50,7 +50,7 @@ public class ErrataPackagesSetupAction extends RhnAction { RequestContext requestContext = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Errata errata = requestContext.lookupErratum(); List<ChannelOverview> chans = new ArrayList<ChannelOverview>(); 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 786f899..d3ff6fc 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 @@ -50,7 +50,7 @@ public class ListPackagesSetupAction extends BaseErrataSetupAction { //Get the errata from the eid in the request Errata errata = requestContext.lookupErratum(); //Get the logged in user - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushAction.java index 8f748fc..0fc7f87 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushAction.java @@ -76,7 +76,7 @@ public class PackagePushAction extends RhnSetAction { RhnSet set = updateSet(request); DynaActionForm daForm = (DynaActionForm) formIn; RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); Long eid = (Long) daForm.get("eid"); Long cid = (Long) daForm.get("cid"); Errata errata = ErrataManager.lookupErrata(eid, user); 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 cdb829b..0365618 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 @@ -54,7 +54,7 @@ public class PackagePushSetupAction extends RhnListAction { HttpServletResponse response) { RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); PageControl pc = new PageControl(); pc.setFilterColumn("earliest"); 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 6921057..a32205a 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 @@ -58,7 +58,7 @@ public class PublishedErrataAction extends RhnAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult result = ErrataManager.publishedOwnedErrata(user); return result; } diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/RemovePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/RemovePackagesAction.java index be644c3..75bfeaa 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/RemovePackagesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/RemovePackagesAction.java @@ -67,7 +67,7 @@ public class RemovePackagesAction extends RhnSetAction { StrutsDelegate strutsDelegate = getStrutsDelegate(); //Get the Logged in user and the errata in question - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Errata errata = requestContext.lookupErratum(); //Retrieve the set containing the ids of the packages we want to remove 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 adf5ac6..9f2b783 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 @@ -44,7 +44,7 @@ public class RemovePackagesSetupAction extends BaseErrataSetupAction { RequestContext requestContext = new RequestContext(request); //Get the logged in user - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); //Setup the page control for this user PageControl pc = new PageControl(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListAllAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListAllAction.java index 1a2abcb..92eadad 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListAllAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListAllAction.java @@ -30,7 +30,7 @@ public class SecurityErrataListAllAction extends ErrataListAllAction { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); return ErrataManager.allSecurityErrata(user); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListRelevantAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListRelevantAction.java index c9306a2..c1cc34b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListRelevantAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/SecurityErrataListRelevantAction.java @@ -29,7 +29,7 @@ public class SecurityErrataListRelevantAction extends ErrataListRelevantAction { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); return ErrataManager.relevantSecurityErrata(user, null); } 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 479c6c2..20ad604 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 @@ -58,7 +58,7 @@ public class UnpublishedErrataAction extends RhnAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult result = ErrataManager.unpublishedOwnedErrata(user); return result; } 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 b15ed8a..e9eca9e 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 @@ -49,7 +49,7 @@ public class BaseErrataSetupActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Errata published = ErrataFactoryTest .createTestPublishedErrata(user.getOrg().getId()); 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 adf0ea0..e907d4c 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 @@ -67,7 +67,7 @@ public class ChannelActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); - User usr = requestContext.getLoggedInUser(); + User usr = requestContext.getCurrentUser(); //create the errata Errata errata = ErrataFactoryTest.createTestUnpublishedErrata(usr.getOrg().getId()); @@ -114,7 +114,7 @@ public class ChannelActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); user.addRole(RoleFactory.CHANNEL_ADMIN); //create the errata 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 70c1331..9ca2eb0 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 @@ -98,12 +98,12 @@ public class ChannelSetupActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(sah.getRequest()); //make sure set is empty - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); RhnSet set = RhnSetDecl.CHANNELS_FOR_ERRATA.get(user); assertTrue(set.isEmpty()); //Set the setupdated variable to make sure we are keeping changes from the set - User usr = requestContext.getLoggedInUser(); + User usr = requestContext.getCurrentUser(); RhnSet newset = RhnSetDecl.CHANNELS_FOR_ERRATA.create(usr); newset.addElement(new Long(42)); newset.addElement(new Long(43)); @@ -159,7 +159,7 @@ public class ChannelSetupActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(sah.getRequest()); //make sure set is not empty - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); RhnSet set = RhnSetDecl.CHANNELS_FOR_ERRATA.get(user); assertFalse(set.isEmpty()); } 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 9b8c9cc..7c99d7f 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 @@ -57,7 +57,7 @@ public class DeleteBugActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); //Create a test errata with a bug - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Errata e = ErrataFactoryTest.createTestPublishedErrata(user.getOrg().getId()); Long bugId = new Long(42); String bugSummary = "This bug is tagged for destruction"; 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 fce3634..a5a50cf 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 @@ -61,7 +61,7 @@ public class EditActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); //Create a new unpublished errata - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Errata errata = ErrataFactoryTest .createTestUnpublishedErrata(user.getOrg().getId()); //Create another for checking adv name uniqueness constraint @@ -152,7 +152,7 @@ public class EditActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Errata errata = ErrataFactoryTest.createTestErrata(user.getOrg().getId()); request.setupAddParameter("eid", errata.getId().toString()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ListPackagesActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ListPackagesActionTest.java index aa756ca..cb3dd4d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ListPackagesActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ListPackagesActionTest.java @@ -59,7 +59,7 @@ public class ListPackagesActionTest extends RhnBaseTestCase { Package pkg = PackageTest.createTestPackage(user.getOrg()); String[] selected = {pkg.getId().toString()}; - RhnSet pre = RhnSetDecl.PACKAGES_TO_REMOVE.get(requestContext.getLoggedInUser()); + RhnSet pre = RhnSetDecl.PACKAGES_TO_REMOVE.get(requestContext.getCurrentUser()); //make sure the set is empty assertTrue(pre.isEmpty()); @@ -70,7 +70,7 @@ public class ListPackagesActionTest extends RhnBaseTestCase { ActionForward result = action.confirm(mapping, form, request, response); - RhnSet post = RhnSetDecl.PACKAGES_TO_REMOVE.get(requestContext.getLoggedInUser()); + RhnSet post = RhnSetDecl.PACKAGES_TO_REMOVE.get(requestContext.getCurrentUser()); //make sure something is in the set assertFalse(post.isEmpty()); //make sure we're going to the confirm forward 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 6010a33..f16a49b 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 @@ -52,7 +52,7 @@ public class NotifyActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Errata published = ErrataFactoryTest .createTestPublishedErrata(user.getOrg().getId()); Channel c = ChannelFactoryTest.createBaseChannel(user); 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 52adca5..b2a514d 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 @@ -49,7 +49,7 @@ public class NotifySetupActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Errata published = ErrataFactoryTest .createTestPublishedErrata(user.getOrg().getId()); Errata unpublished = ErrataFactoryTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/RemovePackagesActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/RemovePackagesActionTest.java index b1e934d..58378b9 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/RemovePackagesActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/RemovePackagesActionTest.java @@ -59,7 +59,7 @@ public class RemovePackagesActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Errata errata = ErrataFactoryTest.createTestPublishedErrata(user.getOrg().getId()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/AddSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/AddSystemsAction.java index 66f770d..034b0e4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/groups/AddSystemsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/groups/AddSystemsAction.java @@ -52,7 +52,7 @@ public class AddSystemsAction extends BaseListAction { HttpServletResponse response) { RequestContext context = new RequestContext(request); ManagedServerGroup sg = context.lookupAndBindServerGroup(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Set <String> set = helper.getSet(); List<Server> servers = new LinkedList<Server>(); for (String id : set) { @@ -76,7 +76,7 @@ public class AddSystemsAction extends BaseListAction { /** {@inheritDoc} */ public List getResult(RequestContext context) { ManagedServerGroup sg = context.lookupAndBindServerGroup(); - return SystemManager.systemsNotInGroup(context.getLoggedInUser(), + return SystemManager.systemsNotInGroup(context.getCurrentUser(), sg, null); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/DeleteGroupAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/DeleteGroupAction.java index 4ce2f1e..3b7b5f6 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/groups/DeleteGroupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/groups/DeleteGroupAction.java @@ -45,7 +45,7 @@ public class DeleteGroupAction extends RhnAction { if (context.isSubmitted()) { String [] params = {serverGroup.getName()}; ServerGroupManager manager = ServerGroupManager.getInstance(); - manager.remove(context.getLoggedInUser(), serverGroup); + manager.remove(context.getCurrentUser(), serverGroup); getStrutsDelegate().saveMessage(DELETED_MESSAGE_KEY, params, request); return mapping.findForward("success"); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/EditGroupAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/EditGroupAction.java index 89ff426..8d3a208 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/groups/EditGroupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/groups/EditGroupAction.java @@ -117,7 +117,7 @@ public class EditGroupAction extends RhnAction { if (errors.isEmpty()) { ServerGroupManager manager = ServerGroupManager.getInstance(); - ManagedServerGroup sg = manager.create(ctx.getLoggedInUser(), + ManagedServerGroup sg = manager.create(ctx.getCurrentUser(), form.getString("name"), form.getString("description")); return sg.getId(); @@ -154,7 +154,7 @@ public class EditGroupAction extends RhnAction { // Check if sg already exists ManagedServerGroup newGroup = ServerGroupFactory.lookupByNameAndOrg(name, - ctx.getLoggedInUser().getOrg()); + ctx.getCurrentUser().getOrg()); // Ugly condition for two error cases: // creating page + group name exists diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/GroupDetailAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/GroupDetailAction.java index 5039105..a4c9b74 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/groups/GroupDetailAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/groups/GroupDetailAction.java @@ -44,7 +44,7 @@ public class GroupDetailAction extends RhnAction { HttpServletRequest request, HttpServletResponse response) { RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); ManagedServerGroup sg = rctx.lookupAndBindServerGroup(); HashMap errataCounts = (HashMap) ServerGroupManager.getInstance().errataCounts(user, sg); diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/ListRemoveSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/ListRemoveSystemsAction.java index 7a4f913..815009e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/groups/ListRemoveSystemsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/groups/ListRemoveSystemsAction.java @@ -52,7 +52,7 @@ public class ListRemoveSystemsAction extends BaseListAction { HttpServletResponse response) { RequestContext context = new RequestContext(request); ManagedServerGroup sg = context.lookupAndBindServerGroup(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Set <String> set = helper.getSet(); List<Server> servers = new LinkedList<Server>(); for (String id : set) { 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 49efdfb..dcc779f 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 @@ -42,7 +42,7 @@ public class HelpAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); String doc = Config.get().getString(ConfigDefaults.DOC_REFERENCE_GUIDE); if (doc != null && doc.trim().length() > 0) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java index 2ba38eb..63d1c57 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java @@ -114,7 +114,7 @@ public class AdvancedModeDetailsAction extends RhnAction { DynaActionForm form, ActionMapping mapping) { try { KickstartData data = getKsData(context); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); KickstartBuilder builder = new KickstartBuilder(user); KickstartWizardHelper cmd = new KickstartWizardHelper(user); KickstartableTree tree = cmd.getKickstartableTree( @@ -143,7 +143,7 @@ public class AdvancedModeDetailsAction extends RhnAction { DynaActionForm form, ActionMapping mapping) { try { validateInput(form, context); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); KickstartTreeUpdateType updateType = null; KickstartWizardHelper cmd = new KickstartWizardHelper(user); KickstartableTree tree = cmd.getKickstartableTree( @@ -153,13 +153,13 @@ public class AdvancedModeDetailsAction extends RhnAction { updateType = KickstartTreeUpdateType.ALL; tree = KickstartFactory.getNewestTree(updateType, tree.getChannel().getId(), - context.getLoggedInUser().getOrg()); + context.getCurrentUser().getOrg()); } else if (form.get(UPDATE_RED_HAT_PARAM) != null) { updateType = KickstartTreeUpdateType.RED_HAT; tree = KickstartFactory.getNewestTree(updateType, tree.getChannel().getId(), - context.getLoggedInUser().getOrg()); + context.getCurrentUser().getOrg()); } else { updateType = KickstartTreeUpdateType.NONE; @@ -186,7 +186,7 @@ public class AdvancedModeDetailsAction extends RhnAction { ks.setRealUpdateType(updateType); KickstartDetailsEditAction.processCobblerFormValues(ks, form, - context.getLoggedInUser()); + context.getCurrentUser()); return getStrutsDelegate().forwardParam(mapping.findForward("success"), RequestContext.KICKSTART_ID, @@ -208,7 +208,7 @@ public class AdvancedModeDetailsAction extends RhnAction { } private void setup(RequestContext context, DynaActionForm form) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); KickstartWizardHelper cmd = new KickstartWizardHelper(user); loadTrees(cmd, form, context); loadVirtualizationTypes(cmd, form, context); @@ -295,7 +295,7 @@ public class AdvancedModeDetailsAction extends RhnAction { private void validateInput(DynaActionForm form, RequestContext context) { String label = form.getString(KICKSTART_LABEL_PARAM); - KickstartBuilder builder = new KickstartBuilder(context.getLoggedInUser()); + KickstartBuilder builder = new KickstartBuilder(context.getCurrentUser()); if (isCreateMode(context.getRequest())) { builder.validateNewLabel(label); } @@ -315,13 +315,13 @@ public class AdvancedModeDetailsAction extends RhnAction { KickstartableTree tree = KickstartFactory.lookupKickstartTreeByIdAndOrg( (Long) form.get(KSTREE_ID_PARAM), - context.getLoggedInUser().getOrg()); + context.getCurrentUser().getOrg()); KickstartVirtualizationType vType = KickstartFactory.lookupKickstartVirtualizationTypeByLabel( form.getString(VIRTUALIZATION_TYPE_LABEL_PARAM)); Distro distro = CobblerProfileCommand.getCobblerDistroForVirtType(tree, vType, - context.getLoggedInUser()); + context.getCurrentUser()); if (distro == null) { ValidatorException.raiseException("kickstart.cobbler.profile.invalidvirt"); } 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 136f21c..55e8b86 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 @@ -65,7 +65,7 @@ public abstract class BaseKickstartEditAction extends RhnAction { RequestContext requestContext = new RequestContext(request); BaseKickstartCommand cmd = getCommand(requestContext); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); StrutsDelegate strutsDelegate = getStrutsDelegate(); //Display message if this kickstart profile's channel is inadequate. diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java index f5c2d0c..0fe2148 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/CreateProfileWizardAction.java @@ -181,7 +181,7 @@ public class CreateProfileWizardAction extends RhnWizardAction { try { String kickstartLabel = form.getString(KICKSTART_LABEL_PARAM); - KickstartBuilder builder = new KickstartBuilder(ctx.getLoggedInUser()); + KickstartBuilder builder = new KickstartBuilder(ctx.getCurrentUser()); try { builder.validateNewLabel(kickstartLabel); @@ -203,7 +203,7 @@ public class CreateProfileWizardAction extends RhnWizardAction { } else { tree = KickstartFactory.getNewestTree(updateType, channelId, - ctx.getLoggedInUser().getOrg()); + ctx.getCurrentUser().getOrg()); form.set(KSTREE_ID_PARAM, tree.getId()); } 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 0cbf7d0..5dcfd60 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 @@ -79,7 +79,7 @@ public class KickstartAdvancedOptionsAction extends RhnAction { List displayList = new LinkedList(); //Display message if this kickstart profile's channel is inadequate. - User user = new RequestContext(request).getLoggedInUser(); + User user = new RequestContext(request).getCurrentUser(); if (!helper.verifyKickstartChannel(cmd.getKickstartData(), user)) { getStrutsDelegate().saveMessages(request, helper.createInvalidChannelMsg(cmd.getKickstartData())); 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 e9c1757..60b0eae 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 @@ -69,7 +69,7 @@ public class KickstartCloneAction extends RhnAction { } else { String label = form.getString("label"); - KickstartBuilder builder = new KickstartBuilder(ctx.getLoggedInUser()); + KickstartBuilder builder = new KickstartBuilder(ctx.getCurrentUser()); // Validate the label try { builder.validateNewLabel(label); diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java index 01214d8..b421a44 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java @@ -118,7 +118,7 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction { setupCobblerFormValues(ctx, form, cmd.getKickstartData()); KickstartWizardHelper wizardHelper = new - KickstartWizardHelper(ctx.getLoggedInUser()); + KickstartWizardHelper(ctx.getCurrentUser()); // Lookup the kickstart virtualization types and pre-select the current one: List types = wizardHelper.getVirtualizationTypes(); form.set(VIRTUALIZATION_TYPES, types); @@ -143,7 +143,7 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction { public static void setupCobblerFormValues(RequestContext ctx, DynaActionForm form, KickstartData data) { Profile prof = Profile.lookupById(CobblerXMLRPCHelper.getConnection( - ctx.getLoggedInUser()), data.getCobblerId()); + ctx.getCurrentUser()), data.getCobblerId()); if (prof != null) { form.set(KERNEL_OPTIONS, prof.getKernelOptionsString()); form.set(POST_KERNEL_OPTIONS, prof.getKernelPostOptionsString()); @@ -197,7 +197,7 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction { ValidatorError error = null; KickstartEditCommand cmd = (KickstartEditCommand) cmdIn; RequestContext ctx = new RequestContext(request); - KickstartBuilder builder = new KickstartBuilder(ctx.getLoggedInUser()); + KickstartBuilder builder = new KickstartBuilder(ctx.getCurrentUser()); cmd.setComments(form.getString(COMMENTS)); try { @@ -207,7 +207,7 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction { form.getString(VIRTUALIZATION_TYPE_LABEL)); Distro distro = CobblerProfileCommand.getCobblerDistroForVirtType( - cmdIn.getKickstartData().getTree(), vType, ctx.getLoggedInUser()); + cmdIn.getKickstartData().getTree(), vType, ctx.getCurrentUser()); if (distro == null) { ValidatorException.raiseException("kickstart.cobbler.profile.invalidvirt"); } @@ -230,7 +230,7 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction { cmd.getKickstartData().setKsCfg( BooleanUtils.toBoolean((Boolean) form.get(KS_CFG))); - processCobblerFormValues(cmd.getKickstartData(), form, ctx.getLoggedInUser()); + processCobblerFormValues(cmd.getKickstartData(), form, ctx.getCurrentUser()); String virtTypeLabel = form.getString(VIRTUALIZATION_TYPE_LABEL); KickstartVirtualizationType ksVirtType = KickstartFactory. diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartFileDownloadAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartFileDownloadAction.java index 716c7c5..c09b134 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartFileDownloadAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartFileDownloadAction.java @@ -76,7 +76,7 @@ public class KickstartFileDownloadAction extends BaseKickstartEditAction { * not needed. */ if (helper.verifyKickstartChannel( - cmdIn.getKickstartData(), ctx.getLoggedInUser(), false)) { + cmdIn.getKickstartData(), ctx.getCurrentUser(), false)) { try { request.setAttribute(FILEDATA, StringEscapeUtils.escapeHtml( KickstartManager.getInstance().renderKickstart(data))); 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 cf22d3b..3263154 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 @@ -97,7 +97,7 @@ public class KickstartIpRangeAction extends RhnAction { //Display message if this kickstart profile's channel is inadequate. KickstartHelper helper = new KickstartHelper(request); - User user = new RequestContext(request).getLoggedInUser(); + User user = new RequestContext(request).getCurrentUser(); if (!helper.verifyKickstartChannel(ksData, user)) { strutsDelegate.saveMessages(request, helper.createInvalidChannelMsg(cmd.getKickstartData())); 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 fe11019..e8ab942 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 @@ -50,7 +50,7 @@ public class KickstartIpRangeSetupAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); String urlStr; try { diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartProfileVariableAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartProfileVariableAction.java index b00f736..4b13228 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartProfileVariableAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartProfileVariableAction.java @@ -40,7 +40,7 @@ public class KickstartProfileVariableAction extends KickstartVariableAction { protected String getCobblerId(RequestContext context) { Long ksid = context.getRequiredParam(RequestContext.KICKSTART_ID); KickstartData data = KickstartFactory.lookupKickstartDataByIdAndOrg( - context.getLoggedInUser().getOrg(), ksid); + context.getCurrentUser().getOrg(), ksid); if (data == null) { return null; } @@ -61,7 +61,7 @@ public class KickstartProfileVariableAction extends KickstartVariableAction { super.setupFormValues(ctx, form, cId); Long ksid = ctx.getRequiredParam(RequestContext.KICKSTART_ID); KickstartData data = KickstartFactory.lookupKickstartDataByIdAndOrg( - ctx.getLoggedInUser().getOrg(), ksid); + ctx.getCurrentUser().getOrg(), ksid); ctx.getRequest().setAttribute("ksdata", data); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java index 163d8d2..0d1e749 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java @@ -238,7 +238,7 @@ public class KickstartSoftwareEditAction extends BaseKickstartEditAction { KickstartableTree tree = null; Long channelId = (Long) form.get(CHANNEL); String url = form.getString(URL); - Org org = ctx.getLoggedInUser().getOrg(); + Org org = ctx.getCurrentUser().getOrg(); if (form.get(USE_NEWEST_KSTREE_PARAM) != null) { updateType = KickstartTreeUpdateType.ALL; @@ -260,7 +260,7 @@ public class KickstartSoftwareEditAction extends BaseKickstartEditAction { Distro distro = CobblerProfileCommand.getCobblerDistroForVirtType(tree, ksdata.getKickstartDefaults().getVirtualizationType(), - ctx.getLoggedInUser()); + ctx.getCurrentUser()); if (distro == null) { return new ValidatorError("kickstart.cobbler.profile.invalidtreeforvirt"); } @@ -277,7 +277,7 @@ public class KickstartSoftwareEditAction extends BaseKickstartEditAction { ksdata.setRealUpdateType(updateType); CobblerProfileEditCommand cpec = new CobblerProfileEditCommand(ksdata, - ctx.getLoggedInUser()); + ctx.getCurrentUser()); cpec.store(); // Process the selected child channels 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 b1a6c16..eee5e2a 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 @@ -82,7 +82,7 @@ public abstract class KickstartVariableAction extends RhnAction { */ protected void checkPermissions(HttpServletRequest request) { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); if (!user.hasRole(RoleFactory.CONFIG_ADMIN)) { //Throw an exception with a nice error message so the user //knows what went wrong. @@ -101,7 +101,7 @@ public abstract class KickstartVariableAction extends RhnAction { */ protected void setupFormValues(RequestContext ctx, DynaActionForm form, String cId) { - CobblerObject cobj = getCobblerObject(cId, ctx.getLoggedInUser()); + CobblerObject cobj = getCobblerObject(cId, ctx.getCurrentUser()); form.set(VARIABLES, StringUtil.convertMapToString(cobj.getKsMeta(), "\n")); } @@ -118,7 +118,7 @@ public abstract class KickstartVariableAction extends RhnAction { try { - CobblerObject cobj = getCobblerObject(cId, ctx.getLoggedInUser()); + CobblerObject cobj = getCobblerObject(cId, ctx.getCurrentUser()); cobj.setKsMeta(StringUtil.convertOptionsToMap((String)form.get(VARIABLES), "kickstart.jsp.error.invalidvariable", "\n")); cobj.save(); 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 de63b7b..66ac071 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 @@ -50,7 +50,7 @@ public class KickstartsSetupAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); DataResult <KickstartDto>result = KickstartLister.getInstance(). kickstartsInOrg(user.getOrg(), null); for (KickstartDto dto : result) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java index 665bcf9..eff703b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java @@ -193,7 +193,7 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { */ public static void setupProxyInfo(RequestContext ctx) { List<OrgProxyServer> proxies = SystemManager. - listProxies(ctx.getLoggedInUser().getOrg()); + listProxies(ctx.getCurrentUser().getOrg()); if (proxies != null && proxies.size() > 0) { List<LabelValueBean> formatted = new LinkedList<LabelValueBean>(); @@ -497,7 +497,7 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { ctx.getRequest().setAttribute("profile", cmd.getKsdata()); ctx.getRequest().setAttribute("distro", cmd.getKsdata().getTree()); CobblerConnection con = CobblerXMLRPCHelper. - getConnection(ctx.getLoggedInUser()); + getConnection(ctx.getCurrentUser()); Distro distro = Distro.lookupById(con, cmd.getKsdata().getTree().getCobblerId()); @@ -724,7 +724,7 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { protected KickstartScheduleCommand getScheduleCommand(DynaActionForm form, RequestContext ctx, Date scheduleTime, String host) { String cobblerId = form.getString(RequestContext.COBBLER_ID); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); KickstartScheduleCommand cmd; KickstartData data = KickstartFactory .lookupKickstartDataByCobblerIdAndOrg(user.getOrg(), cobblerId); diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java index cfec8e8..66bb7a4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java @@ -59,7 +59,7 @@ public class SystemDetailsEditAction extends RhnAction { HttpServletRequest request, HttpServletResponse response) throws Exception { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); if (!user.hasRole(RoleFactory.ORG_ADMIN) && !user.hasRole(RoleFactory.CONFIG_ADMIN)) { @@ -152,7 +152,7 @@ public class SystemDetailsEditAction extends RhnAction { private void transferEdits(DynaActionForm form, KickstartData ksdata, RequestContext ctx) { SystemDetailsCommand command = new SystemDetailsCommand(ksdata, ctx - .getLoggedInUser()); + .getCurrentUser()); transferRootPasswordEdits(form, command); if (!ksdata.isLegacyKickstart()) { @@ -166,7 +166,7 @@ public class SystemDetailsEditAction extends RhnAction { private void prepareForm(DynaActionForm dynaForm, KickstartData ksdata, RequestContext ctx) { prepareSELinuxConfig(dynaForm, ksdata); - prepareRegistrationTypeConfig(dynaForm, ksdata, ctx.getLoggedInUser()); + prepareRegistrationTypeConfig(dynaForm, ksdata, ctx.getCurrentUser()); prepareFlags(dynaForm, ksdata); dynaForm.set("submitted", Boolean.TRUE); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ViewTreesAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ViewTreesAction.java index 67acc19..7ac106d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ViewTreesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ViewTreesAction.java @@ -50,7 +50,7 @@ public class ViewTreesAction extends RhnAction implements Listable { * {@inheritDoc} */ public List getResult(RequestContext contextIn) { - return KickstartFactory.listTreesByOrg(contextIn.getLoggedInUser().getOrg()); + return KickstartFactory.listTreesByOrg(contextIn.getCurrentUser().getOrg()); } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/cobbler/CobblerSnippetDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/cobbler/CobblerSnippetDetailsAction.java index 470e4bc..0d132c9 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/cobbler/CobblerSnippetDetailsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/cobbler/CobblerSnippetDetailsAction.java @@ -119,7 +119,7 @@ public class CobblerSnippetDetailsAction extends RhnAction { RequestContext context = new RequestContext(request); if (isCreateMode(request)) { request.setAttribute(PREFIX, CobblerSnippet.getPrefixFor( - context.getLoggedInUser().getOrg())); + context.getCurrentUser().getOrg())); } else { String param = NAME; @@ -147,7 +147,7 @@ public class CobblerSnippetDetailsAction extends RhnAction { try { String name = context.getParam(lookupParam, true); return CobblerSnippet.loadEditable(name, - context.getLoggedInUser().getOrg()); + context.getCurrentUser().getOrg()); } catch (ValidatorException ve) { LOG.error(ve); @@ -198,7 +198,7 @@ public class CobblerSnippetDetailsAction extends RhnAction { isCreateMode(request), name, form.getString(CONTENTS), - context.getLoggedInUser().getOrg()); + context.getCurrentUser().getOrg()); if (!isCreateMode(request) && !form.getString(NAME).equals(form.getString(OLD_NAME))) { snip.rename(form.getString(NAME)); 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 69a0f9f..a93600b 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 @@ -52,7 +52,7 @@ public class CobblerSnippetListSetupAction extends RhnAction { request.setAttribute(mapping.getParameter(), Boolean.TRUE); RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); List<CobblerSnippet> result; if (ALL.equals(mapping.getParameter())) { result = CobblerSnippetLister.getInstance().list(user); diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java index 3f582d3..e870356 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java @@ -70,7 +70,7 @@ public class SsmKSScheduleAction extends RhnAction implements Listable { public ActionForward execute(ActionMapping mapping, ActionForm formIn, HttpServletRequest request, HttpServletResponse response) throws Exception { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DynaActionForm form = (DynaActionForm)formIn; if ("ip".equals(mapping.getParameter())) { request.setAttribute(SCHEDULE_TYPE_IP, Boolean.TRUE); @@ -103,7 +103,7 @@ public class SsmKSScheduleAction extends RhnAction implements Listable { private List<Action> schedule(HttpServletRequest request, ActionForm form, RequestContext context) { SSMScheduleCommand com = null; - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DynaActionForm dynaForm = (DynaActionForm) form; @@ -176,7 +176,7 @@ public class SsmKSScheduleAction extends RhnAction implements Listable { return Collections.EMPTY_LIST; } - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); List profiles = KickstartLister.getInstance().listProfilesForSsm(user); if (profiles.isEmpty()) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKickstartableSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKickstartableSystemsAction.java index 26f3329..5f3f863 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKickstartableSystemsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKickstartableSystemsAction.java @@ -59,12 +59,12 @@ public class SsmKickstartableSystemsAction extends RhnAction implements Listable helper.execute(); List <KickstartIpRange> range = KickstartManager.getInstance(). - listIpRanges(context.getLoggedInUser()); + listIpRanges(context.getCurrentUser()); if (range.isEmpty()) { request.setAttribute(DISABLE_RANGES, Boolean.TRUE); } List profiles = KickstartLister.getInstance(). - listProfilesForSsm(context.getLoggedInUser()); + listProfilesForSsm(context.getCurrentUser()); if (profiles.isEmpty()) { request.setAttribute(DISABLE_PROFILES, Boolean.TRUE); @@ -77,7 +77,7 @@ public class SsmKickstartableSystemsAction extends RhnAction implements Listable * ${@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); List ret = KickstartManager.getInstance().kickstartableSystemsInSsm(user); if (ret.isEmpty()) { context.getRequest().setAttribute(DISABLE_SYSTEMS, Boolean.TRUE); diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/KickstartTreeVariableAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/KickstartTreeVariableAction.java index 424d0bc..9b0d3d9 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/KickstartTreeVariableAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/KickstartTreeVariableAction.java @@ -40,7 +40,7 @@ public class KickstartTreeVariableAction extends KickstartVariableAction { protected String getCobblerId(RequestContext context) { Long kstid = context.getRequiredParam(RequestContext.KSTREE_ID); KickstartableTree tree = KickstartFactory.lookupKickstartTreeByIdAndOrg( - kstid, context.getLoggedInUser().getOrg()); + kstid, context.getCurrentUser().getOrg()); if (tree == null) { return null; } 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 3cb1878..fab53df 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 @@ -53,7 +53,7 @@ public class ProbeSuiteListProbesSetupAction extends RhnAction implements Listab HttpServletResponse response) { RequestContext ctx = new RequestContext(request); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); ProbeSuite suite = ctx.lookupProbeSuite(); @@ -102,7 +102,7 @@ public class ProbeSuiteListProbesSetupAction extends RhnAction implements Listab public List getResult(RequestContext context) { Long id = context.getRequiredParam(RequestContext.SUITE_ID); return MonitoringManager.getInstance().listProbesInSuite(id, - context.getLoggedInUser(), null); + context.getCurrentUser(), null); } } 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 40a9fb8..a4df158 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 @@ -73,6 +73,6 @@ public class ProbeSuiteListSetupAction extends RhnAction implements Listable { */ public List getResult(RequestContext context) { return MonitoringManager.getInstance().listProbeSuites( - context.getLoggedInUser(), null); + context.getCurrentUser(), null); } } 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 f233934..600fe7b 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 @@ -86,7 +86,7 @@ public class ProbeSuiteSystemsAction extends RhnSetAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Set selectedSystems = updateSet(request).getElements(); ProbeSuite suite = new RequestContext(request).lookupProbeSuite(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsEditAction.java index f7d6dc1..3cef1b9 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsEditAction.java @@ -64,7 +64,7 @@ public class ProbeSuiteSystemsEditAction extends RhnSetAction { RequestContext requestContext = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Set selectedSystems = updateSet(request).getElements(); ProbeSuite suite = requestContext.lookupProbeSuite(); Iterator i = selectedSystems.iterator(); 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 2bf47a7..eb0b6eb 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 @@ -63,7 +63,7 @@ public class ProbeSuitesRemoveAction extends RhnSetAction { RhnSet set = updateSet(request); Map params = makeParamMap(formIn, request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); //if they chose no probe suites, return to the same page with a message if (set.isEmpty()) { 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 97433ff..feb96a7 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 @@ -83,7 +83,7 @@ public class FilterListSetupActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); - user = requestContext.getLoggedInUser(); + user = requestContext.getCurrentUser(); RhnSet set = (RhnSet) request.getAttribute("set"); DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST); 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 27dae35..10e17bf 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 @@ -69,7 +69,7 @@ public class ProbeSuiteSystemsSetupActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); assertNotNull(request.getAttribute("probeSuite")); - user = requestContext.getLoggedInUser(); + user = requestContext.getCurrentUser(); RhnSet set = (RhnSet) request.getAttribute("set"); List dr = (List) request.getAttribute(RequestContext.PAGE_LIST); 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 6faf461..6387b73 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 @@ -65,7 +65,7 @@ public class ProbeSuitesRemoveSetupActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); - user = requestContext.getLoggedInUser(); + user = requestContext.getCurrentUser(); set = (RhnSet) request.getAttribute("set"); DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST); diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ExtAuthRoleMappingAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/ExtAuthRoleMappingAction.java index 6e2bcd4..66da042 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ExtAuthRoleMappingAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/ExtAuthRoleMappingAction.java @@ -53,7 +53,7 @@ public class ExtAuthRoleMappingAction extends RhnAction implements Listable { * ${@inheritDoc} */ public List getResult(RequestContext contextIn) { - User user = contextIn.getLoggedInUser(); + User user = contextIn.getCurrentUser(); return UserGroupFactory.listExtAuthGroups(user); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgChannelListAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgChannelListAction.java index 4b65221..0b6cc87 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgChannelListAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgChannelListAction.java @@ -63,7 +63,7 @@ public class OrgChannelListAction extends RhnAction implements Listable { // with protected access RequestContext context = new RequestContext(request); Long cid = context.getParamAsLong("cid"); - Channel channel = ChannelManager.lookupByIdAndUser(cid, context.getLoggedInUser()); + Channel channel = ChannelManager.lookupByIdAndUser(cid, context.getCurrentUser()); if (!channel.isProtected()) { throw new PermissionException("Channel does not have protected access"); @@ -82,7 +82,7 @@ public class OrgChannelListAction extends RhnAction implements Listable { if (helper.isDispatched()) { Set<String> selectedItems = helper.getSet(); - handleDispatch(context.getLoggedInUser(), channel, selectedItems); + handleDispatch(context.getCurrentUser(), channel, selectedItems); helper.destroy(); @@ -106,7 +106,7 @@ public class OrgChannelListAction extends RhnAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Org org = user.getOrg(); Long cid = context.getParamAsLong(RequestContext.CID); return OrgManager.orgChannelTrusts(cid, org); 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 9322a2d..332e685 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 @@ -45,7 +45,7 @@ public class OrgTrustDetailsAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Org org = user.getOrg(); Long oid = requestContext.getParamAsLong(RequestContext.ORG_ID); 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 64fbd24..5608105 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 @@ -44,7 +44,7 @@ public class OrganizationAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); DataList result = OrgManager.activeOrgs(user); request.setAttribute(ListTagHelper.PAGE_LIST, result); 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 a66d773..5f507ed 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 @@ -45,7 +45,7 @@ public class OrganizationTrustAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); String name = user.getOrg().getName(); String orgid = user.getOrg().getId().toString(); DataList<TrustedOrgDto> result = OrgManager.trustedOrgs(user); 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 a0a5655..f639980 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 @@ -62,7 +62,7 @@ public class SatRoleConfirm extends RhnAction { return mapping.findForward("cancel"); } - User u = UserManager.lookupUser(requestContext.getLoggedInUser(), uid); + User u = UserManager.lookupUser(requestContext.getCurrentUser(), uid); // just in case user bypasses user page using bookmarks if (SatManager.getActiveSatAdmins().size() == 1) { 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 35e9614..c102645 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 @@ -46,7 +46,7 @@ public class SatUserListAction extends RhnAction { HttpServletRequest request, HttpServletResponse response) throws Exception { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long oid = user.getOrg().getId(); Org org = OrgFactory.lookupById(oid); String name = org.getName(); 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 299a5f6..06405d3 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 @@ -74,7 +74,7 @@ public class SoftwareEntitlementSubscriptionsAction extends RhnAction implements DynaActionForm dynaForm = (DynaActionForm) formIn; RequestContext ctx = new RequestContext(request); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); Long cfid = ctx.getParamAsLong("cfid"); ChannelFamily channelFamily = ChannelFamilyFactory.lookupById(cfid); @@ -323,7 +323,7 @@ public class SoftwareEntitlementSubscriptionsAction extends RhnAction implements lookupById(contextIn.getParamAsLong("cfid")); List<OrgSoftwareEntitlementDto> entitlementUsage = ChannelManager.listEntitlementsForAllOrgsWithEmptyOrgs(cf, - contextIn.getLoggedInUser()); + contextIn.getCurrentUser()); Org satelliteOrg = OrgFactory.getSatelliteOrg(); for (Iterator <OrgSoftwareEntitlementDto> itr = 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 56c63c1..80123c3 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 @@ -46,7 +46,7 @@ public class SoftwareEntitlementsAction extends RhnAction implements Listable { HttpServletRequest request, HttpServletResponse response) throws Exception { RequestContext requestContext = new RequestContext(request); - User u = requestContext.getLoggedInUser(); + User u = requestContext.getCurrentUser(); ListHelper helper = new ListHelper(this, request); helper.execute(); Long orgCount = OrgManager.getTotalOrgCount(u); 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 a359083..3de9424 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 @@ -59,7 +59,7 @@ public class SystemEntitlementOrgsAction extends RhnAction { String entitlementLabel = request.getParameter("label"); Entitlement e = EntitlementManager.getByName(entitlementLabel); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); request.setAttribute("entname", e.getHumanReadableLabel()); //Get and store values submitted if (isSubmitted(dynaForm)) { 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 6c2e644..9121367 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 @@ -44,7 +44,7 @@ public class SystemEntitlementsAction extends RhnAction { HttpServletRequest request, HttpServletResponse response) throws Exception { RequestContext requestContext = new RequestContext(request); - User u = requestContext.getLoggedInUser(); + User u = requestContext.getCurrentUser(); List<SystemEntitlementsDto>result = OrgManager.allOrgsEntitlements(); 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 f9482fa..a3dbac4 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 @@ -128,7 +128,7 @@ public class TrustAction extends FormDispatcher { RequestContext context = new RequestContext(request); RhnListSetHelper helper = new RhnListSetHelper(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); RhnSet set = RHNSET.get(user); Long oid = context.getParamAsLong(RequestContext.ORG_ID); Org theOrg = OrgFactory.lookupById(oid); @@ -205,7 +205,7 @@ public class TrustAction extends FormDispatcher { RequestContext context = new RequestContext(request); RhnListSetHelper helper = new RhnListSetHelper(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); RhnSet set = RHNSET.get(user); Long oid = context.getParamAsLong(RequestContext.ORG_ID); Org theOrg = OrgFactory.lookupById(oid); @@ -244,7 +244,7 @@ public class TrustAction extends FormDispatcher { RequestContext context = new RequestContext(request); RhnListSetHelper helper = new RhnListSetHelper(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); RhnSet set = RHNSET.get(user); Long oid = context.getParamAsLong(RequestContext.ORG_ID); Org theOrg = OrgFactory.lookupById(oid); 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 4f19500..77edde2 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 @@ -46,7 +46,7 @@ public class UserListSetupAction extends RhnAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long oid = requestContext.getParamAsLong(RequestContext.ORG_ID); Org org = OrgFactory.lookupById(oid); diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/YourRhnClipsRenderer.java b/java/code/src/com/redhat/rhn/frontend/action/renderers/YourRhnClipsRenderer.java index 4ba7d25..99f2156 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/renderers/YourRhnClipsRenderer.java +++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/YourRhnClipsRenderer.java @@ -42,7 +42,7 @@ public class YourRhnClipsRenderer extends RhnAction { HttpServletRequest request, HttpServletResponse response) throws Exception { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); PageControl pc = new PageControl(); pc.setStart(1); pc.setPageSize(5); diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesAction.java index af091be..07cde81 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesAction.java @@ -58,7 +58,7 @@ public abstract class BaseSystemPackagesAction extends RhnAction { Long sid = requestContext.getRequiredParam("sid"); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Server server = SystemManager.lookupByIdAndUser(sid, user); Set sessionSet = SessionSetHelper.lookupAndBind(request, getDecl(sid)); 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 2aab397..06cd91b 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 @@ -187,7 +187,7 @@ public abstract class BaseSystemPackagesConfirmAction extends RhnAction { StrutsDelegate strutsDelegate = getStrutsDelegate(); Long sid = requestContext.getRequiredParam("sid"); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); //updateList(newactions, user.getId()); List<Map<String, Long>> data = PackageListItem.toKeyMaps(getDataResult(request)); 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 063cfb4..a137ad7 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 @@ -67,7 +67,7 @@ public class CustomPackageListAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); if (!user.hasRole(RoleFactory.CHANNEL_ADMIN)) { throw new PermissionException(RoleFactory.CHANNEL_ADMIN); 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 6dbc309..36c3a10 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 @@ -56,7 +56,7 @@ public class CustomPackagesDeleteConfirmAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); if (!user.hasRole(RoleFactory.CHANNEL_ADMIN)) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallConfirmSetupAction.java index a0481f0..5315ee6 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallConfirmSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallConfirmSetupAction.java @@ -78,7 +78,7 @@ public class InstallConfirmSetupAction extends BaseSystemPackagesConfirmAction { RequestContext context, List<Map<String, Long>> pkgs, Date earliest) { - return ActionManager.schedulePackageInstall(context.getLoggedInUser(), + return ActionManager.schedulePackageInstall(context.getCurrentUser(), context.lookupAndBindServer(), pkgs, earliest); } 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 c10ff2d..206f9fd 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 @@ -69,7 +69,7 @@ public class InstallPatchSetAction extends LookupDispatchAction { RequestContext requestContext = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long sid = requestContext.getRequiredParam("sid"); Long pid = requestContext.getRequiredParam("pid"); 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 01c59e9..17399f2 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 @@ -48,7 +48,7 @@ public class InstallPatchSetSetupAction extends RhnAction { Long sid = requestContext.getRequiredParam("sid"); Long pid = requestContext.getRequiredParam("pid"); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Server server = SystemManager.lookupByIdAndUser(sid, user); request.setAttribute("system", server); 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 4c2414f..511ecd3 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 @@ -47,7 +47,7 @@ public class PackageChangeLogAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); long pid = requestContext.getRequiredParam("pid"); Package pkg = PackageFactory.lookupByIdAndUser(pid, user); 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 b20f320..6400eb6 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 @@ -57,7 +57,7 @@ public class PackageDetailsAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); //If this is an easy one and we have the pid if (request.getParameter("pid") != null) { 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 ef3fa66..a1b32e3 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 @@ -63,7 +63,7 @@ public class PackageIndexAction extends LookupDispatchAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long sid = requestContext.getRequiredParam("sid"); Server server = SystemManager.lookupByIdAndUser(sid, user); @@ -99,7 +99,7 @@ public class PackageIndexAction extends LookupDispatchAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long sid = requestContext.getRequiredParam("sid"); SdcHelper.ssmCheck(request, sid, user); request.setAttribute("system", SystemManager.lookupByIdAndUser(sid, user)); diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/RemoveConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/RemoveConfirmSetupAction.java index 73a9267..b15afd7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/RemoveConfirmSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/RemoveConfirmSetupAction.java @@ -56,7 +56,7 @@ public class RemoveConfirmSetupAction extends BaseSystemPackagesConfirmAction { @Override protected PackageAction schedulePackageAction(ActionForm formIn, RequestContext context, List<Map<String, Long>> pkgs, Date earliest) { - return ActionManager.schedulePackageRemoval(context.getLoggedInUser(), + return ActionManager.schedulePackageRemoval(context.getCurrentUser(), context.lookupAndBindServer(), pkgs, earliest); } 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 8802a23..63beb4f 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 @@ -74,7 +74,7 @@ public class ScheduleRemoteCommand extends RhnAction { DynaActionForm f = (DynaActionForm)form; RequestContext requestContext = new RequestContext(request); Long sid = requestContext.getRequiredParam("sid"); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Server server = SystemManager.lookupByIdAndUser(sid, user); request.setAttribute("system", server); 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 4fad23a..4d9df40 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 @@ -47,7 +47,7 @@ public class SolarisPatchSetListSetupAction extends RhnListAction { Long sid = requestContext.getRequiredParam("sid"); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); PageControl pc = new PageControl(); pc.setIndexData(true); pc.setFilterColumn("name"); diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradeConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradeConfirmSetupAction.java index 8cd2620..075661b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradeConfirmSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradeConfirmSetupAction.java @@ -56,7 +56,7 @@ public class UpgradeConfirmSetupAction extends BaseSystemPackagesConfirmAction { @Override protected PackageAction schedulePackageAction(ActionForm formIn, RequestContext context, List<Map<String, Long>> pkgs, Date earliest) { - return ActionManager.schedulePackageUpgrade(context.getLoggedInUser(), + return ActionManager.schedulePackageUpgrade(context.getCurrentUser(), context.lookupAndBindServer(), pkgs, earliest); diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/VerifyConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/VerifyConfirmSetupAction.java index 1bfc0e7..9bed7fc 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/VerifyConfirmSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/VerifyConfirmSetupAction.java @@ -50,7 +50,7 @@ public class VerifyConfirmSetupAction extends BaseSystemPackagesConfirmAction { @Override protected PackageAction schedulePackageAction(ActionForm formIn, RequestContext context, List<Map<String, Long>> pkgs, Date earliest) { - return ActionManager.schedulePackageVerify(context.getLoggedInUser(), + return ActionManager.schedulePackageVerify(context.getCurrentUser(), context.lookupAndBindServer(), pkgs, earliest); } 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 81a7575..912f079 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 @@ -65,7 +65,7 @@ public class PatchConfirmAction extends LookupDispatchAction { RequestContext requestContext = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long sid = requestContext.getRequiredParam("sid"); Server server = SystemManager.lookupByIdAndUser(sid, user); RhnSet set = RhnSetDecl.PATCH_REMOVE.get(user); 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 451c72f..5ff4f70 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 @@ -65,7 +65,7 @@ public class PatchConfirmInstallAction extends LookupDispatchAction { RequestContext requestContext = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long sid = requestContext.getRequiredParam("sid"); Server server = SystemManager.lookupByIdAndUser(sid, user); RhnSet set = RhnSetDecl.PATCH_INSTALL.get(user); 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 2cf17c3..3205523 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 @@ -48,7 +48,7 @@ public class PatchConfirmInstallSetupAction extends RhnListAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long sid = requestContext.getRequiredParam("sid"); Server server = SystemManager.lookupByIdAndUser(sid, user); 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 95fa696..98ebdf3 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 @@ -48,7 +48,7 @@ public class PatchConfirmSetupAction extends RhnListAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long sid = requestContext.getRequiredParam("sid"); Server server = SystemManager.lookupByIdAndUser(sid, user); 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 199b045..4c20c67 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 @@ -49,7 +49,7 @@ public class PatchInstallSetupAction extends RhnListAction { Long sid = requestContext.getRequiredParam("sid"); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); PageControl pc = new PageControl(); pc.setIndexData(true); pc.setFilterColumn("name"); 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 03a7300..66525a1 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 @@ -49,7 +49,7 @@ public class PatchListSetupAction extends RhnListAction { Long sid = requestContext.getRequiredParam("sid"); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); PageControl pc = new PageControl(); pc.setIndexData(true); pc.setFilterColumn("name"); 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 e5c41ac..a04310f 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 @@ -60,7 +60,7 @@ public class PatchListSetupTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); RhnSet set = (RhnSet) request.getAttribute("set"); DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST); 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 501203d..6da84af 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 @@ -62,7 +62,7 @@ public class CreateProfileAction extends RhnAction { ActionForward forward = null; DynaActionForm f = (DynaActionForm)form; - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Server server = requestContext.lookupAndBindServer(); request.setAttribute("system", server); 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 eca0a06..f5f86f1 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 @@ -59,7 +59,7 @@ public class DeleteProfileAction extends RhnAction { ActionForward forward = null; DynaActionForm f = (DynaActionForm)form; Long prid = requestContext.getRequiredParam(RequestContext.PRID); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Profile profile = ProfileManager.lookupByIdAndOrg(prid, user.getOrg()); request.setAttribute("profile", profile); 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 763cce9..729629c 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 @@ -54,7 +54,7 @@ public class PackageListAction extends RhnAction implements Listable { Long prid = context.getRequiredParam(RequestContext.PRID); if (prid != null) { profile = ProfileManager.lookupByIdAndOrg(prid, - context.getLoggedInUser().getOrg()); + context.getCurrentUser().getOrg()); request.setAttribute("profile", profile); } 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 3ca3be5..e5b3669 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 @@ -54,7 +54,7 @@ public class ProfileDetailsAction extends RhnAction { Profile profile = null; if (prid != null) { profile = ProfileManager.lookupByIdAndOrg(prid, - context.getLoggedInUser().getOrg()); + context.getCurrentUser().getOrg()); request.setAttribute("profile", profile); } 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 96bc33e..f37fe0d 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 @@ -54,7 +54,7 @@ public class ProfilesListAction extends RhnListAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); return ProfileManager.listProfileOverviews(user.getOrg().getId()); } } 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 d175318..20c3920 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 @@ -63,7 +63,7 @@ public class ShowProfileAction extends RhnAction { ActionForward forward = null; DynaActionForm f = (DynaActionForm)form; Long sid = requestContext.getRequiredParam("sid"); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Server server = SystemManager.lookupByIdAndUser(sid, user); request.setAttribute("system", server); SdcHelper.ssmCheck(request, server.getId(), user); @@ -95,7 +95,7 @@ public class ShowProfileAction extends RhnAction { DynaActionForm f, HttpServletRequest request, HttpServletResponse response) { - User user = new RequestContext(request).getLoggedInUser(); + User user = new RequestContext(request).getCurrentUser(); RhnSetDecl.PACKAGES_FOR_SYSTEM_SYNC.clear(user); Map params = new HashMap(); params.put("sid", request.getParameter("sid")); @@ -107,7 +107,7 @@ public class ShowProfileAction extends RhnAction { private ActionForward compareProfiles(ActionMapping mapping, DynaActionForm f, HttpServletRequest request, HttpServletResponse response) { - User user = new RequestContext(request).getLoggedInUser(); + User user = new RequestContext(request).getCurrentUser(); RhnSetDecl.PACKAGES_FOR_SYSTEM_SYNC.clear(user); Map params = new HashMap(); params.put("sid", request.getParameter("sid")); @@ -131,7 +131,7 @@ public class ShowProfileAction extends RhnAction { } // get lits of Profiles // create a new list of label, value pairs - User user = new RequestContext(request).getLoggedInUser(); + User user = new RequestContext(request).getCurrentUser(); Server server = (Server) request.getAttribute("system"); List dbprofiles = ProfileManager.compatibleWithServer(server, user.getOrg()); List profiles = new ArrayList(dbprofiles.size()); 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 56b70ae..771bbb6 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 @@ -62,7 +62,7 @@ public class SyncProfilesSetupAction extends RhnAction implements Listable { Long prid = requestContext.getRequiredParam(RequestContext.PRID); Long sid = requestContext.getRequiredParam(RequestContext.SID); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Server server = SystemManager.lookupByIdAndUser(sid, user); Profile profile = ProfileManager.lookupByIdAndOrg(prid, user.getOrg()); @@ -100,7 +100,7 @@ public class SyncProfilesSetupAction extends RhnAction implements Listable { public List getResult(RequestContext context) { Long sid = context.getRequiredParam("sid"); Long prid = context.getRequiredParam("prid"); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Set <String> pkgIdCombos = SessionSetHelper.lookupAndBind(context.getRequest(), getDecl(sid)); 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 f54fd9d..20db714 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 @@ -60,7 +60,7 @@ public class SyncSystemsSetupAction extends RhnAction implements Listable { Long sid = requestContext.getRequiredParam(RequestContext.SID); Long sid1 = requestContext.getRequiredParam(RequestContext.SID1); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Server server = SystemManager.lookupByIdAndUser(sid, user); Server server1 = SystemManager.lookupByIdAndUser(sid1, user); @@ -98,7 +98,7 @@ public class SyncSystemsSetupAction extends RhnAction implements Listable { public List getResult(RequestContext context) { Long sid = context.getRequiredParam(RequestContext.SID); Long sid1 = context.getRequiredParam(RequestContext.SID1); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Set <String> pkgIdCombos = SessionSetHelper.lookupAndBind(context.getRequest(), getDecl(sid)); 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 a071fef..f208de1 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 @@ -77,7 +77,7 @@ public class SchedulePackageInstallationAction extends RhnListAction implements if (requestContext.wasDispatched("installconfirm.jsp.confirm")) { // Load data from the web components - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Date earliest = getStrutsDelegate() .readDatePicker((DynaActionForm) actionForm, "date", DatePicker.YEAR_RANGE_POSITIVE); @@ -131,7 +131,7 @@ public class SchedulePackageInstallationAction extends RhnListAction implements /** {@inheritDoc} */ public List getResult(RequestContext context) { Long cid = context.getRequiredParam(RequestContext.CID); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult dataResult = SystemManager.systemsSubscribedToChannelInSet(cid, user, SetLabels.SYSTEM_LIST); 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 438fd77..4535fb1 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 @@ -121,7 +121,7 @@ public class SchedulePackageRemoveAction extends RhnListAction implements Listab */ public DataResult<Map> getResult(RequestContext context, boolean shorten) { HttpServletRequest request = context.getRequest(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); // Stuff packages into an RhnSet to be used in the query String packagesDecl = (String) request.getAttribute("packagesDecl"); @@ -164,7 +164,7 @@ public class SchedulePackageRemoveAction extends RhnListAction implements Listab RequestContext context = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); // Load the date selected by the user Date earliest = getStrutsDelegate().readDatePicker((DynaActionForm) formIn, "date", DatePicker.YEAR_RANGE_POSITIVE); 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 34582bc..e0fa2e7 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 @@ -109,7 +109,7 @@ public class SchedulePackageUpgradeAction extends RhnAction implements Listable public List getResult(RequestContext context) { HttpServletRequest request = context.getRequest(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); // Stuff packages into an RhnSet to be used in the query String packagesDecl = (String) request.getAttribute("packagesDecl"); @@ -184,7 +184,7 @@ public class SchedulePackageUpgradeAction extends RhnAction implements Listable RequestContext context = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); // Load the date selected by the user Date earliest = getStrutsDelegate().readDatePicker((DynaActionForm) formIn, 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 4850cb6..386973f 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 @@ -70,7 +70,7 @@ public class SchedulePackageVerifyAction extends RhnAction implements Listable { RequestContext context = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); // Load the date selected by the user Date earliest = getStrutsDelegate().readDatePicker( @@ -118,7 +118,7 @@ public class SchedulePackageVerifyAction extends RhnAction implements Listable { public List getResult(RequestContext context) { HttpServletRequest request = context.getRequest(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); // Stuff packages into an RhnSet to be used in the query String packagesDecl = (String) request.getAttribute("packagesDecl"); diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java index 83c7639..3a3ffca 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java @@ -94,7 +94,7 @@ public class ScheduleRemoteCommand extends RhnAction { if (MODE_INSTALL.equals(mode)) { cid = requestContext.getRequiredParam("cid"); } - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Map reqMap = new HashMap(); reqMap.putAll(request.getParameterMap()); @@ -256,7 +256,7 @@ public class ScheduleRemoteCommand extends RhnAction { private List getUpgradeResult(RequestContext context, String setLabel) { HttpServletRequest request = context.getRequest(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); // Stuff packages into an RhnSet to be used in the query if (setLabel != null) { @@ -324,7 +324,7 @@ public class ScheduleRemoteCommand extends RhnAction { private List getRemoveResult(RequestContext context, String setLabel) { HttpServletRequest request = context.getRequest(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); // Stuff packages into an RhnSet to be used in the query String packagesDecl = (String) request.getAttribute("packagesDecl"); 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 2977900..6de2cc2 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 @@ -66,7 +66,7 @@ public class SelectRemovePackagesAction extends RhnAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult result = PackageManager.packagesFromServerSet(user); return result; 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 d731b94..3b93a0c 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 @@ -71,7 +71,7 @@ public class SelectUpgradePackagesAction extends RhnAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult result = PackageManager.upgradablePackagesFromServerSet(user); return result; } 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 d8bd8b5..2b4e536 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 @@ -65,7 +65,7 @@ public class SelectVerifyPackagesAction extends RhnAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult result = PackageManager.packagesFromServerSet(user); return result; 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 dccf11e..060fab6 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 @@ -46,7 +46,7 @@ public class InstallPatchSetSetupTest extends RhnBaseTestCase { RhnMockHttpServletRequest request = TestUtils.getRequestWithSessionAndUser(); RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); user.addRole(RoleFactory.ORG_ADMIN); Server system = ServerFactoryTest.createTestServer(user); 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 829f848..5724eeb 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 @@ -52,7 +52,7 @@ public class CobblerAction extends RhnAction { if (ctx.isSubmitted()) { ValidatorError ve; try { - ve = new CobblerSyncCommand(ctx.getLoggedInUser()).store(); + ve = new CobblerSyncCommand(ctx.getCurrentUser()).store(); } catch (Exception ex) { this.getStrutsDelegate().addError(errors, 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 8cf104d..243807c 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 @@ -71,7 +71,7 @@ public class MonitoringConfigAction extends BaseConfigAction { RequestContext requestContext = new RequestContext(req); DynaActionForm form = (DynaActionForm) formIn; - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); List configList = getManager(). getEditableConfigMacros(user); 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 8d9c0de..8b041c0 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 @@ -44,7 +44,7 @@ public class ActionDetailsSetupAction extends RhnAction { Long aid = requestContext.getRequiredParam("aid"); - Action action = ActionManager.lookupAction(requestContext.getLoggedInUser(), + Action action = ActionManager.lookupAction(requestContext.getCurrentUser(), aid); ActionFormatter af = action.getFormatter(); request.setAttribute("actionname", af.getName()); 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 26d44f2..18f5101 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 @@ -50,7 +50,7 @@ public abstract class ActionSystemsSetupAction extends RhnListAction { Long aid = requestContext.getRequiredParam("aid"); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); PageControl pc = new PageControl(); pc.setFilterColumn("earliest"); 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 44af5d2..3beb1bf 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 @@ -53,7 +53,7 @@ public class ArchivedActionsSetupAction extends BaseScheduledListAction { * {@inheritDoc} */ public List getResult(RequestContext context) { - return ActionManager.archivedActions(context.getLoggedInUser(), null); + return ActionManager.archivedActions(context.getCurrentUser(), null); } /** @@ -66,7 +66,7 @@ public class ArchivedActionsSetupAction extends BaseScheduledListAction { RequestContext requestContext = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); RhnSet set = getSetDecl().get(user); ActionManager.deleteActions(user, getSetDecl().getLabel()); 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 e5fe9a8..20fed3e 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 @@ -101,7 +101,7 @@ public abstract class BaseScheduledListAction extends RhnAction implements Lista RequestContext requestContext = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); //Update the set first and get the size so we know //how many actions we have archived. RhnSet set = getSetDecl().get(user); diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedActionsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedActionsSetupAction.java index 1186420..f63ba4a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedActionsSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/CompletedActionsSetupAction.java @@ -47,7 +47,7 @@ public class CompletedActionsSetupAction extends BaseScheduledListAction { * {@inheritDoc} */ public List getResult(RequestContext context) { - return ActionManager.completedActions(context.getLoggedInUser(), null); + return ActionManager.completedActions(context.getCurrentUser(), null); } /** 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 9ce3729..40e8001 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 @@ -47,7 +47,7 @@ public class CompletedSystemsSetupAction extends RhnListAction { Long aid = requestContext.getRequiredParam("aid"); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); PageControl pc = new PageControl(); Action action = ActionManager.lookupAction(user, aid); diff --git a/java/code/src/com/redhat/rhn/frontend/action/schedule/FailedSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/schedule/FailedSystemsAction.java index 04a3fa7..652074e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/schedule/FailedSystemsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/schedule/FailedSystemsAction.java @@ -56,7 +56,7 @@ public class FailedSystemsAction extends RhnSetAction { RequestContext requestContext = new RequestContext(request); Long aid = requestContext.getParamAsLong("aid"); - Action action = ActionManager.lookupAction(requestContext.getLoggedInUser(), + Action action = ActionManager.lookupAction(requestContext.getCurrentUser(), aid); updateSet(request); ActionManager.rescheduleAction(action, true); 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 bc5af3e..b84e265 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 @@ -59,7 +59,7 @@ public class InProgressSystemsAction extends RhnSetAction { RequestContext requestContext = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long aid = requestContext.getParamAsLong("aid"); Action action = ActionManager.lookupAction(user, aid); /* 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 9c9603d..db021d1 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 @@ -49,7 +49,7 @@ public class PackageListSetupAction extends RhnAction implements Listable { RequestContext requestContext = new RequestContext(request); Long actionId = requestContext.getRequiredParam("aid"); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Action action = ActionManager.lookupAction(user, actionId); 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 5547a5b..7e6cb22 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 @@ -87,7 +87,7 @@ public class PendingActionsDeleteConfirmAction extends RhnAction implements List RequestContext requestContext = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); RhnSet set = getSetDecl().get(user); diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListAction.java index 89ea40a..6097f98 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListAction.java @@ -93,6 +93,6 @@ public class ErrataListAction extends RhnAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext context) { - return ErrataManager.relevantErrataToSystemSet(context.getLoggedInUser()); + return ErrataManager.relevantErrataToSystemSet(context.getCurrentUser()); } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListConfirmAction.java index 09ed82f..3df0394 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListConfirmAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListConfirmAction.java @@ -78,7 +78,7 @@ public class ErrataListConfirmAction extends RhnAction implements DynaActionForm formIn, HttpServletRequest request) { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Date earliest = getStrutsDelegate().readDatePicker(formIn, "date", DatePicker.YEAR_RANGE_POSITIVE); 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 856aedf..d3b6d72 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 @@ -56,7 +56,7 @@ public class ListSystemsAction extends RhnAction implements Listable { * ${@inheritDoc} */ public List getResult(RequestContext context) { - return SystemManager.inSet(context.getLoggedInUser(), + return SystemManager.inSet(context.getCurrentUser(), RhnSetDecl.SYSTEMS.getLabel()); } } 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 d1a567f..5cec581 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 @@ -58,10 +58,10 @@ public class MigrateSystemsAction extends RhnAction implements Listable { RequestContext context = new RequestContext(request); RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); if (context.wasDispatched("ssm.migrate.systems.confirmbutton")) { - RhnSet set = RhnSetDecl.SYSTEMS.get(context.getLoggedInUser()); + RhnSet set = RhnSetDecl.SYSTEMS.get(context.getCurrentUser()); List<Server> serverList = new ArrayList<Server>(); Iterator it = set.iterator(); @@ -104,7 +104,7 @@ public class MigrateSystemsAction extends RhnAction implements Listable { * {@inheritDoc} */ public List getResult(RequestContext contextIn) { - return SystemManager.inSet(contextIn.getLoggedInUser(), + return SystemManager.inSet(contextIn.getCurrentUser(), RhnSetDecl.SYSTEMS.getLabel()); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java index c6d5416..56806ae 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java +++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java @@ -328,11 +328,11 @@ public class ProvisioningRemoteCommand extends RhnAction implements Listable { */ public List<SystemOverview> getResult(RequestContext context) { List<SystemOverview> dataset = new ArrayList<SystemOverview>(); - List<SystemOverview> sysOvr = SystemManager.inSet(context.getLoggedInUser(), + List<SystemOverview> sysOvr = SystemManager.inSet(context.getCurrentUser(), RhnSetDecl.SYSTEMS.getLabel(), true); for (int i = 0; i < sysOvr.size(); i++) { Server server = SystemManager.lookupByIdAndUser(sysOvr.get(i).getId(), - context.getLoggedInUser()); + context.getCurrentUser()); if (server != null && server.hasEntitlement(EntitlementManager.PROVISIONING) && server.getCapabilities() != null) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemConfirmAction.java index 39bdb3e..d723df4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemConfirmAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/RebootSystemConfirmAction.java @@ -89,7 +89,7 @@ public class RebootSystemConfirmAction extends RhnAction "date", DatePicker.YEAR_RANGE_POSITIVE); MessageQueue.publish(new SsmSystemRebootEvent( - context.getLoggedInUser().getId(), + context.getCurrentUser().getId(), earliest, systemsToReboot)); int n = set.size(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewAllLogAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewAllLogAction.java index e1c0c46..59191e7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewAllLogAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewAllLogAction.java @@ -32,7 +32,7 @@ public class ViewAllLogAction extends BaseViewLogAction { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult result = SsmOperationManager.allOperations(user); return result; } diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewCompletedLogAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewCompletedLogAction.java index e6ee97c..a8116f5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewCompletedLogAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewCompletedLogAction.java @@ -26,7 +26,7 @@ public class ViewCompletedLogAction extends BaseViewLogAction { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult result = SsmOperationManager.completedOperations(user); return result; } diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogAction.java index cc147d9..3c84279 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogAction.java @@ -32,7 +32,7 @@ public class ViewLogAction extends BaseViewLogAction { /** {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult result = SsmOperationManager.inProgressOperations(user); return result; } 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 2839420..065e1a4 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 @@ -56,7 +56,7 @@ public class ViewLogDetailsAction extends RhnListAction implements Listable { // Load the operation details for display long oid = Long.parseLong(request.getParameter(PARAM_OPERATION_ID)); RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); OperationDetailsDto operationData = SsmOperationManager. findOperationById(user, 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 201f2a0..767f834 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 @@ -46,7 +46,7 @@ public abstract class BaseSystemListSetupAction extends RhnListAction { HttpServletResponse response) { RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); PageControl pc = new PageControl(); pc.setIndexData(true); pc.setFilterColumn("name"); 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 3814ea7..cf4aac0 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 @@ -59,7 +59,7 @@ public class ErrataConfirmSetupAction extends RhnAction implements Listable { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long sid = requestContext.getRequiredParam("sid"); @@ -106,7 +106,7 @@ public class ErrataConfirmSetupAction extends RhnAction implements Listable { StrutsDelegate strutsDelegate = getStrutsDelegate(); DynaActionForm form = (DynaActionForm) formIn; - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long sid = requestContext.getRequiredParam("sid"); Map hparams = new HashMap(); @@ -176,7 +176,7 @@ public class ErrataConfirmSetupAction extends RhnAction implements Listable { */ public List getResult(RequestContext context) { Long sid = context.getParamAsLong("sid"); - return SystemManager.errataInSet(context.getLoggedInUser(), + return SystemManager.errataInSet(context.getCurrentUser(), ErrataSetupAction.getSetDecl(sid).getLabel(), null); } 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 72493a1..049c13c 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 @@ -76,7 +76,7 @@ public class ErrataSetupAction extends RhnAction implements Listable { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long sid = requestContext.getRequiredParam("sid"); RhnSet set = getSetDecl(sid).get(user); @@ -192,7 +192,7 @@ public class ErrataSetupAction extends RhnAction implements Listable { //if they chose errata, send them to the confirmation page Long sid = requestContext.getParamAsLong("sid"); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); RhnSet set = getSetDecl(sid).get(user); //if they chose no errata, return to the same page with a message @@ -244,7 +244,7 @@ public class ErrataSetupAction extends RhnAction implements Listable { * {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Long sid = context.getRequiredParam("sid"); String type = context.getParam(SELECTOR, false); String synopsis = ""; 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 c30262b..43c4971 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 @@ -75,7 +75,7 @@ public class OverviewAction extends RhnListAction { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); /* * TODO: This code is for the clear button on the right end of the header. 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 fee798a..1473366 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 @@ -66,11 +66,11 @@ public class SSMDeleteSystemsConfirm extends RhnAction implements Listable { private ActionForward handleConfirm(RequestContext context, ActionMapping mapping) { - RhnSet set = RhnSetDecl.SYSTEMS.get(context.getLoggedInUser()); + RhnSet set = RhnSetDecl.SYSTEMS.get(context.getCurrentUser()); // Fire the request off asynchronously SsmDeleteServersEvent event = - new SsmDeleteServersEvent(context.getLoggedInUser(), + new SsmDeleteServersEvent(context.getCurrentUser(), new ArrayList<Long>(set.getElementValues())); MessageQueue.publish(event); set.clear(); @@ -86,7 +86,7 @@ public class SSMDeleteSystemsConfirm extends RhnAction implements Listable { * {@inheritDoc} */ public List getResult(RequestContext contextIn) { - return SystemManager.inSet(contextIn.getLoggedInUser(), + return SystemManager.inSet(contextIn.getCurrentUser(), RhnSetDecl.SYSTEMS.getLabel()); } 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 62c92b4..c3a65e6 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 @@ -59,7 +59,7 @@ public class SSMUpdateHardwareProfileConfirm extends RhnAction implements Listab HttpServletResponse response) { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); RhnSet set = RhnSetDecl.SYSTEMS.get(user); request.setAttribute("system_count", set.size()); DynaActionForm daForm = (DynaActionForm)formIn; @@ -98,7 +98,7 @@ public class SSMUpdateHardwareProfileConfirm extends RhnAction implements Listab * {@inheritDoc} */ public List getResult(RequestContext contextIn) { - return SystemManager.inSet(contextIn.getLoggedInUser(), + return SystemManager.inSet(contextIn.getCurrentUser(), RhnSetDecl.SYSTEMS.getLabel()); } 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 c50df7a..f85c3ab 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 @@ -60,7 +60,7 @@ public class SSMUpdateSoftwareProfileConfirm extends RhnAction implements Listab HttpServletResponse response) { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); RhnSet set = RhnSetDecl.SYSTEMS.get(user); request.setAttribute("system_count", set.size()); DynaActionForm daForm = (DynaActionForm)formIn; @@ -99,7 +99,7 @@ public class SSMUpdateSoftwareProfileConfirm extends RhnAction implements Listab * {@inheritDoc} */ public List getResult(RequestContext contextIn) { - return SystemManager.inSet(contextIn.getLoggedInUser(), + return SystemManager.inSet(contextIn.getCurrentUser(), RhnSetDecl.SYSTEMS.getLabel()); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java index 81ee4ed..cfe6e36 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SoftwareCrashesAction.java @@ -66,7 +66,7 @@ public class SoftwareCrashesAction extends RhnAction implements Listable { return handleSubmit(mapping, context, server); } - SdcHelper.ssmCheck(request, server.getId(), context.getLoggedInUser()); + SdcHelper.ssmCheck(request, server.getId(), context.getCurrentUser()); 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 c5f1026..0424d2d 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 @@ -58,7 +58,7 @@ public class SystemGroupListSetupAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); DataResult result = SystemManager.groupList(user, null); @@ -117,7 +117,7 @@ public class SystemGroupListSetupAction extends RhnAction { HttpServletRequest request, HttpServletResponse response, RhnSet groupSet) { - User user = new RequestContext(request).getLoggedInUser(); + User user = new RequestContext(request).getCurrentUser(); RhnSet systemSet = RhnSetDecl.SYSTEMS.create(user); if (groupSet.isEmpty()) { @@ -206,7 +206,7 @@ public class SystemGroupListSetupAction extends RhnAction { ActionForm formIn, HttpServletRequest request, HttpServletResponse response, RhnSet groupSet) { - User user = new RequestContext(request).getLoggedInUser(); + User user = new RequestContext(request).getCurrentUser(); RhnSet systemSet = RhnSetDecl.SYSTEMS.create(user); if (groupSet.isEmpty()) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemRemoteCommandAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemRemoteCommandAction.java index 3a3cda3..0ff4484 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemRemoteCommandAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemRemoteCommandAction.java @@ -275,7 +275,7 @@ public class SystemRemoteCommandAction extends RhnAction { // Prepare DynaActionForm form = (DynaActionForm) actionForm; RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Server server = SystemManager.lookupByIdAndUser( context.getRequiredParam(RequestContext.SID), user); ActionErrors errorMessages = new ActionErrors(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/WorkWithGroupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/WorkWithGroupAction.java index 0cf4b8c..1e29ebc 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/WorkWithGroupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/WorkWithGroupAction.java @@ -48,7 +48,7 @@ public class WorkWithGroupAction extends RhnAction { RequestContext requestContext = new RequestContext(request); ManagedServerGroup serverGroup = requestContext.lookupAndBindServerGroup(); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); RhnSet systemSet = RhnSetDecl.SYSTEMS.create(user); diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java index 0f6ee95..305b39a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java @@ -50,7 +50,7 @@ public class RuleDetailsAction extends RhnAction implements Listable { HttpServletRequest request, HttpServletResponse response) { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Long sid = context.getRequiredParam("sid"); Server server = SystemManager.lookupByIdAndUser(sid, user); Long ruleResultId = context.getRequiredParam("rrid"); diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapDownloadAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapDownloadAction.java index 5d4f854..36f9b18 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapDownloadAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapDownloadAction.java @@ -39,7 +39,7 @@ public class ScapDownloadAction extends DownloadAction { HttpServletRequest request, HttpServletResponse response) throws Exception { Logger log = Logger.getLogger(ScapDownloadAction.class); RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Long sid = context.getRequiredParam("sid"); Server server = SystemManager.lookupByIdAndUser(sid, user); Long xid = context.getRequiredParam("xid"); diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapSetupAction.java index 263706a..b79a1a5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapSetupAction.java @@ -33,7 +33,7 @@ public abstract class ScapSetupAction extends RhnAction { protected void setupScapEnablementInfo(RequestContext context) { Server server = context.lookupAndBindServer(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); boolean enabled = ScapManager.isScapEnabled(server, user); context.getRequest().setAttribute(SCAP_ENABLED, enabled); context.getRequest().setAttribute(REQUIRED_PKG, SPACEWALK_OSCAP); diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScheduleXccdfAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScheduleXccdfAction.java index c2992f3..9460b0b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScheduleXccdfAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScheduleXccdfAction.java @@ -60,7 +60,7 @@ public class ScheduleXccdfAction extends ScapSetupAction { if (isSubmitted(form)) { Long sid = context.getRequiredParam("sid"); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Server server = SystemManager.lookupByIdAndUser(sid, user); ActionErrors errors = RhnValidationHelper.validateDynaActionForm(this, form); 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 35618c0..5006497 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 @@ -51,7 +51,7 @@ public class XccdfDetailsAction extends RhnAction implements Listable { HttpServletRequest request, HttpServletResponse response) { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Long sid = context.getRequiredParam("sid"); Server server = SystemManager.lookupByIdAndUser(sid, user); Long xid = context.getRequiredParam("xid"); 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 46e2eee..3d87988 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 @@ -46,7 +46,7 @@ public class CreateCustomKeyAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); if (requestContext.isSubmitted()) { String label = request.getParameter(LABEL_PARAM); 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 bfeb32d..e5190f1 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 @@ -44,7 +44,7 @@ public class CustomKeyListAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); DataResult result = SystemManager.listDataKeys(user); request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI()); 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 d93e1d7..f142de9 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 @@ -45,7 +45,7 @@ public class DeleteCustomKeyAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long cikid = requestContext.getParamAsLong(CIKID_PARAM); CustomDataKey key = OrgFactory.lookupKeyById(cikid); 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 7ef87d3..e704738 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 @@ -57,7 +57,7 @@ public class UpdateCustomKeyAction extends RhnAction implements Listable { RequestContext context = new RequestContext(request); DynaActionForm form = (DynaActionForm)formIn; - User loggedInUser = context.getLoggedInUser(); + User loggedInUser = context.getCurrentUser(); Long cikid = context.getParamAsLong(CIKID_PARAM); CustomDataKey key = OrgFactory.lookupKeyById(cikid); @@ -112,7 +112,7 @@ public class UpdateCustomKeyAction extends RhnAction implements Listable { /** {@inheritDoc} **/ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Long cikid = context.getParamAsLong(CIKID_PARAM); List servers = ServerFactory.lookupServersWithCustomKey(user.getId(), cikid); 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 1d294d6..4b4fddc 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 @@ -106,15 +106,15 @@ public class DuplicateSystemsAction extends RhnAction implements Listable { Long count = (Long) contextIn.getRequest().getAttribute(INACTIVE_COUNT); if (contextIn.getRequest().getAttribute(HOSTNAME) != null) { return SystemManager.listDuplicatesByHostname - (contextIn.getLoggedInUser(), count); + (contextIn.getCurrentUser(), count); } else if (contextIn.getRequest().getAttribute(MAC_ADDRESS) != null) { - return SystemManager.listDuplicatesByMac(contextIn.getLoggedInUser(), count); + return SystemManager.listDuplicatesByMac(contextIn.getCurrentUser(), count); } else if (contextIn.getRequest().getAttribute(IPV6) != null) { - return SystemManager.listDuplicatesByIPv6(contextIn.getLoggedInUser(), count); + return SystemManager.listDuplicatesByIPv6(contextIn.getCurrentUser(), count); } - return SystemManager.listDuplicatesByIP(contextIn.getLoggedInUser(), count); + return SystemManager.listDuplicatesByIP(contextIn.getCurrentUser(), count); } private RhnSetDecl getSetDecl() { 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 3144ac2..9d3336b 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 @@ -83,10 +83,10 @@ public class DuplicateSystemsCompareAction extends RhnAction implements Listable if (request.getParameter("btn" + sid) != null) { Long id = Long.valueOf(sid); Server server = SystemManager.lookupByIdAndUser(id, - context.getLoggedInUser()); + context.getCurrentUser()); String name = server.getName(); server = null; - SystemManager.deleteServer(context.getLoggedInUser(), id); + SystemManager.deleteServer(context.getCurrentUser(), id); getStrutsDelegate().saveMessage("message.serverdeleted.param", new String[] {name}, request); itr.remove(); @@ -111,9 +111,9 @@ public class DuplicateSystemsCompareAction extends RhnAction implements Listable sids.add(Long.valueOf(sid)); } List<Server> systems = SystemManager. - hydrateServerFromIds(sids, context.getLoggedInUser()); + hydrateServerFromIds(sids, context.getCurrentUser()); request.setAttribute("systems", - new SystemCompareDto(systems, context.getLoggedInUser())); + new SystemCompareDto(systems, context.getCurrentUser())); } @@ -128,14 +128,14 @@ public class DuplicateSystemsCompareAction extends RhnAction implements Listable String keyType = contextIn.getRequiredParamAsString(KEY_TYPE); if (DuplicateSystemsAction.HOSTNAME.equals(keyType)) { return SystemManager.listDuplicatesByHostname - (contextIn.getLoggedInUser(), key); + (contextIn.getCurrentUser(), key); } else if (DuplicateSystemsAction.MAC_ADDRESS.equals(keyType)) { - return SystemManager.listDuplicatesByMac(contextIn.getLoggedInUser(), key); + return SystemManager.listDuplicatesByMac(contextIn.getCurrentUser(), key); } else if (DuplicateSystemsAction.IPV6.equals(keyType)) { - return SystemManager.listDuplicatesByIPv6(contextIn.getLoggedInUser(), key); + return SystemManager.listDuplicatesByIPv6(contextIn.getCurrentUser(), key); } - return SystemManager.listDuplicatesByIP(contextIn.getLoggedInUser(), key); + return SystemManager.listDuplicatesByIP(contextIn.getCurrentUser(), key); } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsDeleteSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsDeleteSetupAction.java index dbf42a1..e1a84bb 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsDeleteSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/duplicate/DuplicateSystemsDeleteSetupAction.java @@ -62,11 +62,11 @@ public class DuplicateSystemsDeleteSetupAction extends RhnAction implements List private ActionForward handleConfirm(RequestContext context, ActionMapping mapping) { - RhnSet set = RhnSetDecl.DUPLICATE_SYSTEMS.get(context.getLoggedInUser()); + RhnSet set = RhnSetDecl.DUPLICATE_SYSTEMS.get(context.getCurrentUser()); // Fire the request off asynchronously SsmDeleteServersEvent event = - new SsmDeleteServersEvent(context.getLoggedInUser(), + new SsmDeleteServersEvent(context.getCurrentUser(), new ArrayList<Long>(set.getElementValues())); MessageQueue.publish(event); set.clear(); @@ -81,7 +81,7 @@ public class DuplicateSystemsDeleteSetupAction extends RhnAction implements List * {@inheritDoc} */ public List getResult(RequestContext contextIn) { - return SystemManager.inSet(contextIn.getLoggedInUser(), + return SystemManager.inSet(contextIn.getCurrentUser(), RhnSetDecl.DUPLICATE_SYSTEMS.getLabel(), true); } } 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 4d3be08..30a2d5e 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 @@ -66,7 +66,7 @@ public class EligibleFlexGuestAction extends RhnAction implements Listable { request.setAttribute(SELECTABLE, Boolean.TRUE); RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); //user.hasRole(RoleFactory.ORG_ADMIN) ListSessionSetHelper helper = new ListSessionSetHelper(this, request); helper.execute(); @@ -122,7 +122,7 @@ public class EligibleFlexGuestAction extends RhnAction implements Listable { for (Long cfid : familyGroups.keySet()) { List<Long> sids = new ArrayList<Long>(familyGroups.get(cfid)); success.addAll(VirtualizationEntitlementsManager. - getInstance().convertToFlex(sids, cfid, context.getLoggedInUser())); + getInstance().convertToFlex(sids, cfid, context.getCurrentUser())); } helper.destroy(); @@ -137,7 +137,7 @@ public class EligibleFlexGuestAction extends RhnAction implements Listable { protected List<ChannelFamilySystemGroup> query(RequestContext contextIn) { return VirtualizationEntitlementsManager.getInstance(). - listEligibleFlexGuests(contextIn.getLoggedInUser()); + listEligibleFlexGuests(contextIn.getCurrentUser()); } /** 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 ffd040b..233278d 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 @@ -48,7 +48,7 @@ public class FlexGuestAction extends EligibleFlexGuestAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); request.setAttribute("selected_family", getSelectedChannel(requestContext)); @@ -61,7 +61,7 @@ public class FlexGuestAction extends EligibleFlexGuestAction { @Override protected List<ChannelFamilySystemGroup> query(RequestContext contextIn) { return VirtualizationEntitlementsManager.getInstance(). - listFlexGuests(contextIn.getLoggedInUser()); + listFlexGuests(contextIn.getCurrentUser()); } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSetupAction.java index 6b0bb58..5690c18 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSetupAction.java @@ -101,7 +101,7 @@ public class SystemEntitlementsSetupAction extends BaseSystemListSetupAction { ActionForward forward = super.execute(mapping, formIn, request, response); RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); log.debug("show: " + (request.getAttribute(SHOW_NO_SYSTEMS) == null)); if (request.getAttribute(SHOW_NO_SYSTEMS) == null) { 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 baca395..19f3f14 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 @@ -327,7 +327,7 @@ public class SystemEntitlementsSubmitAction extends Map params = makeParamMap(formIn, request); RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); int successCount = 0; int failureDueToSlotsCount = 0; 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 dcffb91..e30fccd 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 @@ -59,7 +59,7 @@ public class VirtualizationEntitlementsAction extends MappingDispatchAction { request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI()); RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); request.setAttribute(PAGELIST, VirtualizationEntitlementsManager.getInstance(). findGuestLimitedHostsByOrg(user.getOrg())); @@ -81,7 +81,7 @@ public class VirtualizationEntitlementsAction extends MappingDispatchAction { request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI()); RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); request.setAttribute(PAGELIST, VirtualizationEntitlementsManager.getInstance(). findGuestUnlimitedHostsByOrg(user.getOrg())); @@ -104,7 +104,7 @@ public class VirtualizationEntitlementsAction extends MappingDispatchAction { request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI()); RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); request.setAttribute(PAGELIST, VirtualizationEntitlementsManager.getInstance(). findGuestsWithoutHostsByOrg(user.getOrg())); diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/groups/AddGroupsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/groups/AddGroupsAction.java index 1640ae2..a013d22 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/groups/AddGroupsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/groups/AddGroupsAction.java @@ -57,7 +57,7 @@ public class AddGroupsAction extends DispatchedAction { HttpServletResponse response) { RequestContext context = new RequestContext(request); GroupSet groups = new GroupSet(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Server server = context.lookupAndBindServer(); ServerGroupManager manager = ServerGroupManager.getInstance(); @@ -87,7 +87,7 @@ public class AddGroupsAction extends DispatchedAction { throws Exception { RequestContext context = new RequestContext(request); Server server = context.lookupAndBindServer(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); new GroupSet(request); SdcHelper.ssmCheck(request, server.getId(), user); request.setAttribute(ListTagHelper.PARENT_URL, @@ -108,7 +108,7 @@ public class AddGroupsAction extends DispatchedAction { @Override protected List getResult() { RequestContext context = getContext(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Server server = context.lookupAndBindServer(); ServerGroupManager manager = ServerGroupManager.getInstance(); Set<ManagedServerGroup> groups = new HashSet<ManagedServerGroup> diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/groups/BaseListAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/groups/BaseListAction.java index 4ade4f7..c712984 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/groups/BaseListAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/groups/BaseListAction.java @@ -55,7 +55,7 @@ public abstract class BaseListAction extends RhnAction { public static void setup(HttpServletRequest request) { RequestContext context = new RequestContext(request); Server server = context.lookupAndBindServer(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); SdcHelper.ssmCheck(request, server.getId(), user); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/groups/ListRemoveGroupsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/groups/ListRemoveGroupsAction.java index eb16fee..21ae2b3 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/groups/ListRemoveGroupsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/groups/ListRemoveGroupsAction.java @@ -73,7 +73,7 @@ public class ListRemoveGroupsAction extends BaseListAction implements Listable { ActionForm formIn, HttpServletRequest request, HttpServletResponse response) { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Server server = context.lookupAndBindServer(); ServerGroupManager manager = ServerGroupManager.getInstance(); List <Server> servers = new LinkedList<Server>(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbesDeleteConfirmSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbesDeleteConfirmSetupAction.java index 844f7ed..b82662b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbesDeleteConfirmSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbesDeleteConfirmSetupAction.java @@ -50,7 +50,7 @@ public class ProbesDeleteConfirmSetupAction extends RhnListAction implements Lis RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Server server = requestContext.lookupAndBindServer(); Map params = new HashMap(); @@ -76,7 +76,7 @@ public class ProbesDeleteConfirmSetupAction extends RhnListAction implements Lis * {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); return MonitoringManager.getInstance().probesInSet(user, "probe_delete_list"); } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/PreservationListConfirmDeleteAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/PreservationListConfirmDeleteAction.java index 5e1741f..f386b7c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/PreservationListConfirmDeleteAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/PreservationListConfirmDeleteAction.java @@ -43,7 +43,7 @@ public class PreservationListConfirmDeleteAction extends BaseSetListAction { protected DataResult getDataResult(RequestContext rctx, PageControl pc) { RhnSet set = getSetDecl().get(rctx.getCurrentUser()); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); List selectedFileList = new LinkedList(); Iterator i = set.getElements().iterator(); while (i.hasNext()) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/VariablesAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/VariablesAction.java index 53892ee..40c1b3a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/VariablesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/VariablesAction.java @@ -46,7 +46,7 @@ public class VariablesAction extends KickstartVariableAction { HttpServletResponse response) { RequestContext ctx = new RequestContext(request); Server server = ctx.lookupAndBindServer(); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); SdcHelper.ssmCheck(ctx.getRequest(), server.getId(), user); DynaActionForm form = (DynaActionForm)formIn; SystemRecord rec = (SystemRecord) 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 5614e0c..6727867 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 @@ -76,7 +76,7 @@ public class PreservationListConfirmDeleteActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); - user = requestContext.getLoggedInUser(); + user = requestContext.getCurrentUser(); set = (RhnSet) request.getAttribute("set"); DataResult dr = (DataResult) request.getAttribute(RequestContext.PAGE_LIST); 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 8f4c52c..325aa32 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 @@ -54,7 +54,7 @@ public class AddToSSMAction extends RhnAction { HttpServletRequest request, HttpServletResponse response) { RequestContext rctx = new RequestContext(request); Long sid = rctx.getRequiredParam("sid"); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); Server s = SystemManager.lookupByIdAndUser(sid, user); if (s.hasEntitlement(EntitlementManager.MANAGEMENT)) { 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 b4db96d..2f77b14 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 @@ -43,7 +43,7 @@ public class CreateCustomDataAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long sid = requestContext.getRequiredParam(RequestContext.SID); Server server = SystemManager.lookupByIdAndUser(sid, user); 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 a416868..029a339 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 @@ -59,7 +59,7 @@ public class DeleteCustomDataAction extends RhnAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); Long cikid = requestContext.getParamAsLong(CIKID_PARAM); Long sid = requestContext.getRequiredParam(RequestContext.SID); 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 93bd709..5f3c478 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 @@ -55,7 +55,7 @@ public class ListCustomDataAction extends RhnAction { DynaActionForm form = (DynaActionForm)formIn; RequestContext ctx = new RequestContext(request); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); Map params = makeParamMap(request); String fwd = RhnHelper.DEFAULT_FORWARD; 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 69f96d0..35abd24 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 @@ -52,7 +52,7 @@ public class NoteListAction extends RhnListAction { RequestContext rctx = new RequestContext(request); Long sid = rctx.getRequiredParam("sid"); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); Server s = SystemManager.lookupByIdAndUser(sid, user); DataResult dr = SystemManager.systemNotes(s); 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 c263839..5efade2 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 @@ -54,7 +54,7 @@ public class RemoveFromSSMAction extends RhnAction { HttpServletRequest request, HttpServletResponse response) { RequestContext rctx = new RequestContext(request); Long sid = rctx.getRequiredParam("sid"); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); Server s = SystemManager.lookupByIdAndUser(sid, user); if (s.hasEntitlement(EntitlementManager.MANAGEMENT)) { 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 4c2b0ce..f5091f2 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 @@ -87,7 +87,7 @@ public class SystemChannelsAction extends RhnLookupDispatchAction { HttpServletResponse response) { DynaActionForm form = (DynaActionForm) formIn; RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); Server s = SystemManager.lookupByIdAndUser( rctx.getRequiredParam(RequestContext.SID), user); @@ -181,7 +181,7 @@ public class SystemChannelsAction extends RhnLookupDispatchAction { ActionForm formIn, HttpServletRequest request, HttpServletResponse response) { log.debug("SystemChannelsAction.confirmUpdateBaseChannel"); RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); Server s = SystemManager.lookupByIdAndUser( rctx.getRequiredParam(RequestContext.SID), user); request.setAttribute(RequestContext.SYSTEM, s); @@ -264,7 +264,7 @@ public class SystemChannelsAction extends RhnLookupDispatchAction { log.debug("SystemChannelsAction.updateBaseChannel"); RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); Server s = SystemManager.lookupByIdAndUser( rctx.getRequiredParam(RequestContext.SID), user); @@ -303,7 +303,7 @@ public class SystemChannelsAction extends RhnLookupDispatchAction { HttpServletRequest request, HttpServletResponse response) { RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); Server s = SystemManager.lookupByIdAndUser( rctx.getRequiredParam(RequestContext.SID), user); 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 fd7c8e4..4ff48af 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 @@ -56,7 +56,7 @@ public class SystemDeleteConfirmAction extends RhnAction { ActionForward forward = null; Map params = new HashMap(); - User loggedInUser = rctx.getLoggedInUser(); + User loggedInUser = rctx.getCurrentUser(); Long sid = rctx.getRequiredParam(RequestContext.SID); Server server = SystemManager.lookupByIdAndUser(sid, loggedInUser); 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 0a29a47..b5990a4 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 @@ -89,7 +89,7 @@ public class SystemDetailsEditAction extends RhnAction { RequestContext rctx = new RequestContext(request); DynaActionForm daForm = (DynaActionForm) form; - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); Server s = SystemManager.lookupByIdAndUser( rctx.getRequiredParam(RequestContext.SID), user); String forwardName = RhnHelper.DEFAULT_FORWARD; 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 9cf9784..18e95a0 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 @@ -62,7 +62,7 @@ public class SystemHardwareAction extends RhnAction { DynaActionForm form = (DynaActionForm)formIn; RequestContext ctx = new RequestContext(request); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); Map params = makeParamMap(request); String fwd = RhnHelper.DEFAULT_FORWARD; 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 e1bf16c..1521af7 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 @@ -56,7 +56,7 @@ public class SystemMigrateAction extends RhnAction { HttpServletRequest request, HttpServletResponse response) { RequestContext rctx = new RequestContext(request); DynaActionForm daForm = (DynaActionForm) form; - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); String forwardName = RhnHelper.DEFAULT_FORWARD; Integer trustedOrgCount = user.getOrg().getTrustedOrgs().size(); 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 1deffbf..b671b78 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 @@ -53,7 +53,7 @@ public class SystemNoteDeleteAction extends RhnAction { Long nid = Long.parseLong(request.getParameter("nid")); - User loggedInUser = rctx.getLoggedInUser(); + User loggedInUser = rctx.getCurrentUser(); Long sid = Long.parseLong(request.getParameter("sid")); Server server = SystemManager.lookupByIdAndUser(sid, loggedInUser); Note note = SystemManager.lookupNoteByIdAndSystem(loggedInUser, nid, sid); 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 bfd7e98..a178c1a 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 @@ -63,7 +63,7 @@ public class SystemNoteEditAction extends RhnAction { } Note note = new Note(); - User loggedInUser = rctx.getLoggedInUser(); + User loggedInUser = rctx.getCurrentUser(); Long sid = rctx.getRequiredParam(RequestContext.SID); Server server = SystemManager.lookupByIdAndUser(sid, loggedInUser); 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 96d9f2f..5ebe1f2 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 @@ -65,7 +65,7 @@ public class SystemOverviewAction extends RhnAction { HttpServletRequest request, HttpServletResponse response) { RequestContext rctx = new RequestContext(request); Long sid = rctx.getRequiredParam("sid"); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); Server s = SystemManager.lookupByIdAndUser(sid, user); /* Here we htmlify the description stored in the database such that end line's diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemRebootAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemRebootAction.java index d83a3cb..d65c264 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemRebootAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemRebootAction.java @@ -51,7 +51,7 @@ public class SystemRebootAction extends RhnAction { DynaActionForm form = (DynaActionForm) formIn; RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Map<String, Object> params = makeParamMap(request); String forward = RhnHelper.DEFAULT_FORWARD; 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 13fbb42..b9c9b07 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 @@ -66,7 +66,7 @@ public class UpdateCustomDataAction extends RhnAction { RequestContext context = new RequestContext(request); DynaActionForm form = (DynaActionForm)formIn; - User loggedInUser = context.getLoggedInUser(); + User loggedInUser = context.getCurrentUser(); Long sid = context.getRequiredParam(RequestContext.SID); Server server = SystemManager.lookupByIdAndUser(sid, loggedInUser); Map params = new HashMap(); @@ -74,7 +74,7 @@ public class UpdateCustomDataAction extends RhnAction { params.put(RequestContext.SID, request.getParameter(RequestContext.SID)); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Long cikid = context.getParamAsLong(CIKID_PARAM); CustomDataKey key = OrgFactory.lookupKeyById(cikid); diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java index 5ca483d..7957fc4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java @@ -345,7 +345,7 @@ public class ProvisionVirtualizationWizardAction extends ScheduleKickstartWizard if (context.getRequest().getAttribute(PROFILE) == null) { String cobblerId = (String) context.getRequest().getAttribute( RequestContext.COBBLER_ID); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Profile cobblerProfile = Profile.lookupById( CobblerXMLRPCHelper.getConnection(user), cobblerId); context.getRequest().setAttribute(PROFILE, cobblerProfile); @@ -357,7 +357,7 @@ public class ProvisionVirtualizationWizardAction extends ScheduleKickstartWizard protected ProvisionVirtualInstanceCommand getScheduleCommand(DynaActionForm form, RequestContext ctx, Date scheduleTime, String host) { Profile cobblerProfile = getCobblerProfile(ctx); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); ProvisionVirtualInstanceCommand cmd; KickstartData data = KickstartFactory. lookupKickstartDataByCobblerIdAndOrg(user.getOrg(), cobblerProfile.getId()); 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 550e82c..15cd237 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 @@ -86,7 +86,7 @@ public class VirtualGuestsConfirmAction extends BaseSystemListAction { } RequestContext ctx = new RequestContext(request); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); Long sid = ctx.getRequiredParam(RequestContext.SID); Server system = SystemManager.lookupByIdAndUser(sid, user); 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 f715f8c..dc3980f 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 @@ -52,7 +52,7 @@ public class VirtualGuestsConfirmSetupAction extends BaseSystemListSetupAction { HttpServletResponse response) { RequestContext ctx = new RequestContext(request); - User user = ctx.getLoggedInUser(); + User user = ctx.getCurrentUser(); PageControl pc = new PageControl(); pc.setIndexData(true); pc.setFilterColumn("name"); 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 f399c9f..2d4c215 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 @@ -58,7 +58,7 @@ public class VirtualGuestsListSetupAction extends BaseSystemListSetupAction { HttpServletResponse response) { RequestContext rctx = new RequestContext(request); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); PageControl pc = new PageControl(); pc.setIndexData(true); pc.setFilterColumn("name"); @@ -68,7 +68,7 @@ public class VirtualGuestsListSetupAction extends BaseSystemListSetupAction { RhnSet set = getSetDecl().get(user); if (!rctx.isSubmitted()) { - getSetDecl().clear(rctx.getLoggedInUser()); + getSetDecl().clear(rctx.getCurrentUser()); } DataResult dr = getDataResult(user, pc, request); diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java index 6b2c005..e602177 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java @@ -53,7 +53,7 @@ public class BunchDetailAction extends RhnAction implements Listable { HttpServletRequest request, HttpServletResponse response) { RequestContext ctx = new RequestContext(request); - User loggedInUser = ctx.getLoggedInUser(); + User loggedInUser = ctx.getCurrentUser(); String bunchLabel = request.getParameter("label"); request.setAttribute("label", bunchLabel); request.setAttribute("bunchdescription", LocalizationService.getInstance(). @@ -83,7 +83,7 @@ public class BunchDetailAction extends RhnAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext contextIn) { - User user = contextIn.getLoggedInUser(); + User user = contextIn.getCurrentUser(); String bunchName = contextIn.getParam("label", true); try { List<Map> runs = new TaskomaticApi().findRunsByBunch(user, bunchName); 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 16ee486..c5a09ff 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 @@ -46,7 +46,7 @@ public class DeleteScheduleAction extends RhnAction { HttpServletResponse response) { RequestContext ctx = new RequestContext(request); - User loggedInUser = ctx.getLoggedInUser(); + User loggedInUser = ctx.getCurrentUser(); if (ctx.hasParam("schid")) { Long scheduleId = ctx.getParamAsLong(("schid")); diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/SatSchedulesAction.java b/java/code/src/com/redhat/rhn/frontend/action/tasko/SatSchedulesAction.java index f908ba4..31fbbe6 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/tasko/SatSchedulesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/SatSchedulesAction.java @@ -52,7 +52,7 @@ public class SatSchedulesAction extends RhnAction implements Listable { /** {@inheritDoc} */ public List getResult(RequestContext contextIn) { - User user = contextIn.getLoggedInUser(); + User user = contextIn.getCurrentUser(); try { return new TaskomaticApi().findActiveSchedules(user); } 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 23edd57..3650fd5 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 @@ -56,7 +56,7 @@ public class ScheduleDetailAction extends RhnAction { DynaActionForm form = (DynaActionForm)formIn; Map params = makeParamMap(request); RequestContext ctx = new RequestContext(request); - User loggedInUser = ctx.getLoggedInUser(); + User loggedInUser = ctx.getCurrentUser(); Long scheduleId = ctx.getParamAsLong(("schid")); if (ctx.hasParam("schid")) { @@ -178,7 +178,7 @@ public class ScheduleDetailAction extends RhnAction { private void setupForm(HttpServletRequest request, DynaActionForm form) { RequestContext ctx = new RequestContext(request); - User loggedInUser = ctx.getLoggedInUser(); + User loggedInUser = ctx.getCurrentUser(); Long schid = ctx.getParamAsLong("schid"); if (schid != null) { @@ -206,7 +206,7 @@ public class ScheduleDetailAction extends RhnAction { } private void prepDropdowns(RequestContext ctx) { - User loggedInUser = ctx.getLoggedInUser(); + User loggedInUser = ctx.getCurrentUser(); // populate parent base channels List dropDown = new ArrayList(); try { diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/ActivatedSystemsAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/ActivatedSystemsAction.java index 9cd5939..14b8b83 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivatedSystemsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivatedSystemsAction.java @@ -77,7 +77,7 @@ public class ActivatedSystemsAction extends BaseListAction { Map<Long, Long> accessMap = new HashMap<Long, Long>(); Map<Long, String> dateMap = new HashMap<Long, String>(); LocalizationService ls = LocalizationService.getInstance(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); for (Server server : servers) { if (SystemManager.isAvailableToUser(user, server.getId())) { accessMap.put(server.getId(), server.getId()); 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 ffbb4d5..b17e70d 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 @@ -80,7 +80,7 @@ public class ActivationKeyChildChannelsAction extends RhnAction { } private ActivationKey update(DynaActionForm form, RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); ActivationKeyManager manager = ActivationKeyManager.getInstance(); ActivationKey key = context.lookupAndBindActivationKey(); @@ -106,7 +106,7 @@ public class ActivationKeyChildChannelsAction extends RhnAction { RequestContext context) { context.getRequest().setAttribute(CHANNELS, key.getChannels()); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult<HashMap> channelList = getPossibleChannels(user, key.getId()); ArrayList finalList = new ArrayList(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDeleteConfirmAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDeleteConfirmAction.java index 9905374..2720241 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDeleteConfirmAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDeleteConfirmAction.java @@ -45,7 +45,7 @@ public class ActivationKeyDeleteConfirmAction extends RhnAction { if (context.isSubmitted() && context.wasDispatched(DELETE_KEY)) { String [] params = {key.getNote()}; ActivationKeyManager manager = ActivationKeyManager.getInstance(); - manager.remove(key, context.getLoggedInUser()); + manager.remove(key, context.getCurrentUser()); getStrutsDelegate().saveMessage(DELETED_MESSAGE_KEY, params, request); return mapping.findForward("success"); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java index d295926..e18f7e6 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java @@ -91,7 +91,7 @@ public class ActivationKeyDetailsAction extends RhnAction { } request.setAttribute(PREFIX, - ActivationKey.makePrefix(context.getLoggedInUser().getOrg())); + ActivationKey.makePrefix(context.getCurrentUser().getOrg())); request.setAttribute(BLANK_DESCRIPTION, ActivationKeyFactory.DEFAULT_DESCRIPTION); @@ -172,7 +172,7 @@ public class ActivationKeyDetailsAction extends RhnAction { } private ActivationKey update(DynaActionForm form, RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); ActivationKeyManager manager = ActivationKeyManager.getInstance(); ActivationKey key = context.lookupAndBindActivationKey(); @@ -275,7 +275,7 @@ public class ActivationKeyDetailsAction extends RhnAction { } private void setupPossibleChannels(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); List<LabelValueBean> channelWidgets = new LinkedList<LabelValueBean>(); channelWidgets.add(lvl10n("activation-key.jsp.rh-default", String.valueOf(DEFAULT_CHANNEL_ID))); @@ -289,7 +289,7 @@ public class ActivationKeyDetailsAction extends RhnAction { } private void setupEntitlements(RequestContext context) { - Org org = context.getLoggedInUser().getOrg(); + Org org = context.getCurrentUser().getOrg(); Set<LabelValueEnabledBean> entWidgets = new TreeSet<LabelValueEnabledBean>(); context.getRequest().setAttribute(POSSIBLE_ENTS, entWidgets); @@ -300,7 +300,7 @@ public class ActivationKeyDetailsAction extends RhnAction { private ActivationKey create(DynaActionForm daForm, RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); ActivationKeyManager manager = ActivationKeyManager.getInstance(); /** * createNewActivationKey(User user, 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 ba0b931..b8d980c 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 @@ -64,7 +64,7 @@ public class ActivationKeysListAction extends RhnAction { HttpServletRequest request, HttpServletResponse response) throws Exception { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); RhnSet set = getDecl().get(user); List <ActivationKeyDto> dataSet = KickstartLister.getInstance(). @@ -115,7 +115,7 @@ public class ActivationKeysListAction extends RhnAction { private ActionForward handleDispatchAction(ActionMapping mapping, RequestContext context, RhnSet set, List <ActivationKeyDto> currentKeys) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); int numEnabled = 0; int numDisabled = 0; for (ActivationKeyDto dto : currentKeys) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/configuration/ListRemoveChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/configuration/ListRemoveChannelsAction.java index 2abc2af..c514643 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/token/configuration/ListRemoveChannelsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/token/configuration/ListRemoveChannelsAction.java @@ -59,7 +59,7 @@ public class ListRemoveChannelsAction extends BaseListAction { for (String id : set) { Long ccid = Long.valueOf(id); ConfigChannel cc = ConfigurationFactory.lookupConfigChannelById(ccid); - proc.remove(key.getConfigChannelsFor(context.getLoggedInUser()), cc); + proc.remove(key.getConfigChannelsFor(context.getCurrentUser()), cc); } getStrutsDelegate().saveMessage( "config_channels_to_unsubscribe.unsubscribe.success", @@ -79,6 +79,6 @@ public class ListRemoveChannelsAction extends BaseListAction { ConfigurationManager cm = ConfigurationManager.getInstance(); return cm.listGlobalChannelsForActivationKey( context.lookupAndBindActivationKey(), - context.getLoggedInUser()); + context.getCurrentUser()); } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/configuration/RankChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/configuration/RankChannelsAction.java index c84c97f..e75da73 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/token/configuration/RankChannelsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/token/configuration/RankChannelsAction.java @@ -183,7 +183,7 @@ public class RankChannelsAction extends RhnAction { return handleNoScript(mapping, formIn, request, response); } - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DynaActionForm form = (DynaActionForm) formIn; ActivationKey key = context.lookupAndBindActivationKey(); @@ -232,7 +232,7 @@ public class RankChannelsAction extends RhnAction { ActivationKey key = context.lookupAndBindActivationKey(); for (ConfigChannel channel : - key.getConfigChannelsFor(context.getLoggedInUser())) { + key.getConfigChannelsFor(context.getCurrentUser())) { labelValues.add(lv(channel.getName(), channel.getId().toString())); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/configuration/SubscribeChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/configuration/SubscribeChannelsAction.java index dd44d74..1cd83e3 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/token/configuration/SubscribeChannelsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/token/configuration/SubscribeChannelsAction.java @@ -56,7 +56,7 @@ public class SubscribeChannelsAction extends BaseListAction { HttpServletResponse response) { RequestContext context = new RequestContext(request); ActivationKey key = context.lookupAndBindActivationKey(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); Set <String> set = helper.getSet(); if (set.size() == 1 && key.getConfigChannelsFor(user).isEmpty()) { ActionForward af = handleSingleAdd(mapping, context, set.iterator().next()); @@ -75,7 +75,7 @@ public class SubscribeChannelsAction extends BaseListAction { private ActionForward handleSingleAdd(ActionMapping mapping, RequestContext context, String id) { ActivationKey key = context.lookupAndBindActivationKey(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); ConfigChannel ch = ConfigurationFactory.lookupConfigChannelById(Long.valueOf(id)); ConfigChannelListProcessor proc = new ConfigChannelListProcessor(); @@ -94,7 +94,7 @@ public class SubscribeChannelsAction extends BaseListAction { ConfigurationManager cm = ConfigurationManager.getInstance(); return cm.listGlobalChannelsForActivationKeySubscriptions( context.lookupAndBindActivationKey(), - context.getLoggedInUser()); + context.getCurrentUser()); } @Override diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/groups/AddGroupsAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/groups/AddGroupsAction.java index 558de0b..61bb69a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/token/groups/AddGroupsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/token/groups/AddGroupsAction.java @@ -54,7 +54,7 @@ public class AddGroupsAction extends BaseListAction { HttpServletResponse response) { RequestContext context = new RequestContext(request); ActivationKey key = context.lookupAndBindActivationKey(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); ServerGroupManager sgm = ServerGroupManager.getInstance(); for (String id : helper.getSet()) { Long sgid = Long.valueOf(id); @@ -74,7 +74,7 @@ public class AddGroupsAction extends BaseListAction { /** {@inheritDoc} */ public List<ManagedServerGroup> getResult(RequestContext context) { ActivationKey key = context.lookupAndBindActivationKey(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); List <ManagedServerGroup> mainList = ServerGroupFactory. listManagedGroups(user.getOrg()); List <ManagedServerGroup> groups = new LinkedList<ManagedServerGroup>(); @@ -98,7 +98,7 @@ public class AddGroupsAction extends BaseListAction { ServerGroupManager sgm = ServerGroupManager.getInstance(); Map<Long, Long> accessMap = new HashMap<Long, Long>(); for (ServerGroup sg : groups) { - if (sgm.canAccess(context.getLoggedInUser(), sg)) { + if (sgm.canAccess(context.getCurrentUser(), sg)) { accessMap.put(sg.getId(), sg.getId()); } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/groups/ListRemoveGroupsAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/groups/ListRemoveGroupsAction.java index 5d4a816..534198f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/token/groups/ListRemoveGroupsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/token/groups/ListRemoveGroupsAction.java @@ -53,7 +53,7 @@ public class ListRemoveGroupsAction extends BaseListAction { HttpServletResponse response) { RequestContext context = new RequestContext(request); ActivationKey key = context.lookupAndBindActivationKey(); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); ServerGroupManager sgm = ServerGroupManager.getInstance(); Set <String> set = helper.getSet(); for (String id : set) { 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 631ea21..125f3e6 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 @@ -51,10 +51,10 @@ public class AddressesAction extends RhnAction { throw new BadParameterException("uid is null for /rhn/users/"); } - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), uid); + User user = UserManager.lookupUser(requestContext.getCurrentUser(), uid); request.setAttribute(RhnHelper.TARGET_USER, user); if (user == null) { - user = requestContext.getLoggedInUser(); + user = requestContext.getCurrentUser(); } // Set the User on the Request diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/AdminUserEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/AdminUserEditAction.java index 54b034a..5f414c8 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/AdminUserEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/AdminUserEditAction.java @@ -66,7 +66,7 @@ public class AdminUserEditAction extends UserEditActionHelper { StrutsDelegate strutsDelegate = getStrutsDelegate(); //We could be editing ourself, we could be editing another user... - User targetUser = UserManager.lookupUser(requestContext.getLoggedInUser(), + User targetUser = UserManager.lookupUser(requestContext.getCurrentUser(), requestContext.getParamAsLong("uid")); request.setAttribute(RhnHelper.TARGET_USER, targetUser); @@ -74,7 +74,7 @@ public class AdminUserEditAction extends UserEditActionHelper { if (targetUser == null) { throw new BadParameterException("Invalid uid, targetUser not found"); } - User loggedInUser = requestContext.getLoggedInUser(); + User loggedInUser = requestContext.getCurrentUser(); //Update the users details with info entered on the form ActionErrors errors = updateDetails(loggedInUser, targetUser, form); 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 c33d3f7..f4c9ddd 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 @@ -222,7 +222,7 @@ public class AssignedGroupsSetupAction extends RhnListAction { RequestContext requestContext = new RequestContext(request); DynaActionForm form = (DynaActionForm)formIn; - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), + User user = UserManager.lookupUser(requestContext.getCurrentUser(), requestContext.getParamAsLong("uid")); if (user == null) { throw new BadParameterException("Invalid uid"); @@ -262,7 +262,7 @@ public class AssignedGroupsSetupAction extends RhnListAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), + User user = UserManager.lookupUser(requestContext.getCurrentUser(), requestContext.getParamAsLong("uid")); if (user == null) { throw new BadParameterException("Invalid uid"); diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/ChangeEmailAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/ChangeEmailAction.java index 8981b4f..4c040b4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/ChangeEmailAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/ChangeEmailAction.java @@ -50,11 +50,11 @@ public class ChangeEmailAction extends RhnAction { RequestContext requestContext = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), + User user = UserManager.lookupUser(requestContext.getCurrentUser(), requestContext.getParamAsLong("uid")); request.setAttribute(RhnHelper.TARGET_USER, user); if (user == null) { - user = requestContext.getLoggedInUser(); + user = requestContext.getCurrentUser(); } String email = user.getEmail(); 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 ecb86e3..b88dbaf 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 @@ -47,7 +47,7 @@ public class ChangeEmailSetupAction extends RhnAction { RequestContext requestContext = new RequestContext(request); //set logged in user and target user - User loggedInUser = requestContext.getLoggedInUser(); + User loggedInUser = requestContext.getCurrentUser(); User targetUser; Long uid = requestContext.getParamAsLong("uid"); if (uid == null) { 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 7e03da0..3336fcc 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 @@ -62,7 +62,7 @@ public class ChannelManagementPermsSetupAction extends RhnListAction { PageControl pc = new PageControl(); pc.setFilterColumn("name"); - clampListBounds(pc, request, rctx.getLoggedInUser()); + clampListBounds(pc, request, rctx.getCurrentUser()); DataResult dr = UserManager.channelManagement(user, pc); ArrayList selectedChannels = new ArrayList(dr.size()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsAction.java index 9efdcad..68d6b8a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/ChannelPermsAction.java @@ -56,7 +56,7 @@ public class ChannelPermsAction extends RhnListAction { throw new BadParameterException("uid is null or role is empty string"); } - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), uid); + User user = UserManager.lookupUser(requestContext.getCurrentUser(), uid); request.setAttribute(RhnHelper.TARGET_USER, user); String[] channels = (String[]) form.get("cid"); 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 120439a..b37486b 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 @@ -53,7 +53,7 @@ public class ChannelPermsSetupAction extends RhnListAction { Long uid = requestContext.getParamAsLong("uid"); DynaActionForm form = (DynaActionForm)formIn; - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), uid); + User user = UserManager.lookupUser(requestContext.getCurrentUser(), uid); if (user == null) { throw new BadParameterException("Invalid uid"); } @@ -66,7 +66,7 @@ public class ChannelPermsSetupAction extends RhnListAction { pc.setFilterColumn("name"); pc.setFilter(true); - clampListBounds(pc, request, requestContext.getLoggedInUser()); + clampListBounds(pc, request, requestContext.getCurrentUser()); DataResult dr = UserManager.channelSubscriptions(user, pc); diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserAction.java index 431fe6d..2e4e5bd 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserAction.java @@ -189,7 +189,7 @@ public class CreateUserAction extends RhnAction { User user = createIntoOrg(requestContext, command, (String) form.get(UserActionHelper.DESIRED_PASS), msgs); - User orgAdmin = requestContext.getLoggedInUser(); + User orgAdmin = requestContext.getCurrentUser(); saveMessages(request, msgs); command.publishNewUserEvent(orgAdmin, orgAdmin.getOrg().getActiveOrgAdmins(), request.getServerName(), @@ -224,7 +224,7 @@ public class CreateUserAction extends RhnAction { String password, ActionMessages msgs) { - User creator = requestContext.getLoggedInUser(); + User creator = requestContext.getCurrentUser(); Org org = creator.getOrg(); command.setOrg(org); diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAction.java index 5176199..6ab6d8e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAction.java @@ -63,7 +63,7 @@ public class DeleteUserAction extends RhnAction { throw pex; } Long uid = requestContext.getRequiredParam("uid"); - User loggedInUser = requestContext.getLoggedInUser(); + User loggedInUser = requestContext.getCurrentUser(); ActionErrors errors = new ActionErrors(); if (loggedInUser.getId().equals(uid)) { errors.add(ActionMessages.GLOBAL_MESSAGE, 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 da81f52..92ebc9c 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 @@ -56,7 +56,7 @@ public class DeleteUserSetupAction extends RhnAction { } Long uid = requestContext.getRequiredParam("uid"); - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), uid); + User user = UserManager.lookupUser(requestContext.getCurrentUser(), uid); request.setAttribute(RhnHelper.TARGET_USER, user); 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 3f898fe..7706a5f 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 @@ -49,7 +49,7 @@ public class DisableSelfConfirmAction extends RhnAction { ActionForward forward = null; DynaActionForm f = (DynaActionForm)form; - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); if (!isSubmitted(f)) { forward = getStrutsDelegate().forwardParams( diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/DisableUserAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/DisableUserAction.java index a9dd1fd..2ba9aa0 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/DisableUserAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/DisableUserAction.java @@ -61,7 +61,7 @@ public class DisableUserAction extends RhnAction { throw pex; } Long uid = requestContext.getRequiredParam("uid"); - User loggedInUser = requestContext.getLoggedInUser(); + User loggedInUser = requestContext.getCurrentUser(); User user = UserManager.lookupUser(loggedInUser, uid); try { 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 09a22a7..3129e37 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 @@ -59,7 +59,7 @@ public class DisableUserSetupAction extends RhnAction { } Long uid = requestContext.getRequiredParam("uid"); - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), uid); + User user = UserManager.lookupUser(requestContext.getCurrentUser(), uid); request.setAttribute(RhnHelper.TARGET_USER, user); if (user.isDisabled()) { 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 0196a6c..a18d5c3 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 @@ -57,7 +57,7 @@ public class DisabledListSetupAction extends RhnAction { HttpServletResponse response) { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); PageControl pc = setupPageControl(context); RhnSet set = getDecl().get(user); @@ -114,7 +114,7 @@ public class DisabledListSetupAction extends RhnAction { private ActionForward handleDispatchAction(ActionMapping mapping, RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); HttpServletRequest request = context.getRequest(); RhnSet set = getDecl().get(user); Map params = new HashMap(); @@ -136,7 +136,7 @@ public class DisabledListSetupAction extends RhnAction { } protected PageControl setupPageControl(RequestContext context) { - User viewer = context.getLoggedInUser(); + User viewer = context.getCurrentUser(); PageControl pc = new PageControl(); pc.setIndexData(true); pc.setFilterColumn("loginUc"); diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/EditAddressAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/EditAddressAction.java index 9b6b626..5c8f00f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/EditAddressAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/EditAddressAction.java @@ -63,7 +63,7 @@ public class EditAddressAction extends RhnAction { RequestContext requestContext = new RequestContext(request); - User targetUser = UserManager.lookupUser(requestContext.getLoggedInUser(), + User targetUser = UserManager.lookupUser(requestContext.getCurrentUser(), requestContext.getParamAsLong("uid")); request.setAttribute(RhnHelper.TARGET_USER, targetUser); 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 ed31014..49d09cc 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 @@ -53,7 +53,7 @@ public class EditAddressSetupAction extends RhnAction { "Invalid type parameter with null value"); } - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), uid); + User user = UserManager.lookupUser(requestContext.getCurrentUser(), uid); request.setAttribute(RhnHelper.TARGET_USER, user); form.set("uid", user.getId()); if (!RhnValidationHelper.getFailedValidation(request)) { 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 5607d0e..3216b90 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 @@ -61,7 +61,7 @@ public class EnableConfirmSetupAction extends RhnListAction { HttpServletResponse response) { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); if (!user.hasRole(RoleFactory.ORG_ADMIN)) { //Throw an exception with a nice error message so the user //knows what went wrong. @@ -109,7 +109,7 @@ public class EnableConfirmSetupAction extends RhnListAction { private ActionForward handleDispatchAction(ActionMapping mapping, RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); HttpServletRequest request = context.getRequest(); // don't need the result, but we do need this to run. getDecl().get(user); diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/EnableUserAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/EnableUserAction.java index c54b55f..6a6eb58 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/EnableUserAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/EnableUserAction.java @@ -64,7 +64,7 @@ public class EnableUserAction extends RhnAction { RequestContext requestContext = new RequestContext(request); Long uid = requestContext.getRequiredParam("uid"); - User loggedInUser = requestContext.getLoggedInUser(); + User loggedInUser = requestContext.getCurrentUser(); User user = UserManager.lookupUser(loggedInUser, uid); try { 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 c221ff8..3dc6d2f 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 @@ -60,7 +60,7 @@ public class EnableUserSetupAction extends RhnAction { Long uid = requestContext.getRequiredParam("uid"); - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), uid); + User user = UserManager.lookupUser(requestContext.getCurrentUser(), uid); request.setAttribute(RhnHelper.TARGET_USER, user); if (!user.isDisabled()) { 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 6a9bed9..e82272f 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 @@ -62,7 +62,7 @@ public class EnabledListSetupAction extends RhnAction implements Listable { * ${@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); return UserManager.activeInOrg2(user); } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/SelfEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/SelfEditAction.java index 9b900d6..2c887a2 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/SelfEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/SelfEditAction.java @@ -42,7 +42,7 @@ public class SelfEditAction extends UserEditActionHelper { HttpServletResponse response) { DynaActionForm form = (DynaActionForm)formIn; RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); ActionErrors errors = updateDetails(user, user, form); 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 63f3bf5..130b85c 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 @@ -64,8 +64,8 @@ public class UserEditSetupAction extends RhnAction { uid == null) { throw new BadParameterException("Invalid uid for /rhn/users/"); } - User loggedInUser = requestContext.getLoggedInUser(); - User targetUser = UserManager.lookupUser(requestContext.getLoggedInUser(), uid); + User loggedInUser = requestContext.getCurrentUser(); + User targetUser = UserManager.lookupUser(requestContext.getCurrentUser(), uid); request.setAttribute(RhnHelper.TARGET_USER, targetUser); if (targetUser == null) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/UserListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/UserListSetupAction.java index cc33d84..81fb5b7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/UserListSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/UserListSetupAction.java @@ -44,7 +44,7 @@ public class UserListSetupAction extends RhnAction implements Listable { public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); ListHelper helper = new ListHelper(this, request); helper.execute(); return mapping.findForward(RhnHelper.DEFAULT_FORWARD); @@ -56,7 +56,7 @@ public class UserListSetupAction extends RhnAction implements Listable { * {@inheritDoc} */ public List getResult(RequestContext context) { - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); DataResult dr = UserManager.usersInOrg(user, null); dr.elaborate(); return dr; diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/UserPrefAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/UserPrefAction.java index eb24fbb..5ab1c57 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/UserPrefAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/UserPrefAction.java @@ -53,11 +53,11 @@ public class UserPrefAction extends RhnAction { RequestContext requestContext = new RequestContext(request); StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), + User user = UserManager.lookupUser(requestContext.getCurrentUser(), requestContext.getParamAsLong("uid")); request.setAttribute(RhnHelper.TARGET_USER, user); if (user == null) { - user = requestContext.getLoggedInUser(); + user = requestContext.getCurrentUser(); } user.setEmailNotify(BooleanUtils.toInteger((Boolean) 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 dffffed..e096de7 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 @@ -63,10 +63,10 @@ public class UserPrefSetupAction extends RhnAction { "Invalid [null] value for parameter uid"); } - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), uid); + User user = UserManager.lookupUser(requestContext.getCurrentUser(), uid); request.setAttribute(RhnHelper.TARGET_USER, user); if (user == null) { - user = requestContext.getLoggedInUser(); + user = requestContext.getCurrentUser(); } form.set("uid", user.getId()); 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 60c7b70..5e1e8f8 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 @@ -59,7 +59,7 @@ public class VisibleSystemsListAction extends RhnSetAction { HttpServletRequest request, HttpServletResponse response) { - User user = new RequestContext(request).getLoggedInUser(); + User user = new RequestContext(request).getCurrentUser(); //Get a DataResult containing all of the user's systems DataResult dr = getDataResult(user, formIn, request); 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 e77c884..2db8fed 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 @@ -48,14 +48,14 @@ public class VisibleSystemsListSetupAction extends RhnListAction { Long uid = requestContext.getRequiredParam("uid"); - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), uid); + User user = UserManager.lookupUser(requestContext.getCurrentUser(), uid); request.setAttribute(RhnHelper.TARGET_USER, user); PageControl pc = new PageControl(); - clampListBounds(pc, request, requestContext.getLoggedInUser()); + clampListBounds(pc, request, requestContext.getCurrentUser()); DataResult dr = UserManager.visibleSystems(user, pc); //we want set to change for logged in user rather than the target user - RhnSet set = RhnSetDecl.SYSTEMS.get(requestContext.getLoggedInUser()); + RhnSet set = RhnSetDecl.SYSTEMS.get(requestContext.getCurrentUser()); request.setAttribute(RequestContext.PAGE_LIST, dr); request.setAttribute("user", user); diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/test/DeleteUserActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/user/test/DeleteUserActionTest.java index 3469d35..ee115f6 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/test/DeleteUserActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/test/DeleteUserActionTest.java @@ -73,7 +73,7 @@ public class DeleteUserActionTest extends RhnBaseTestCase { //Null parameter request.getParameter("uid"); request.setupAddParameter("uid", (String)null); - requestContext.getLoggedInUser().addRole(RoleFactory.lookupByLabel("org_admin")); + requestContext.getCurrentUser().addRole(RoleFactory.lookupByLabel("org_admin")); try { forward = action.execute(mapping, form, request, response); fail(); @@ -102,7 +102,7 @@ public class DeleteUserActionTest extends RhnBaseTestCase { //try to delete org admin failure.setPath("path"); User usr = UserTestUtils.createUser("testUser", - requestContext.getLoggedInUser().getOrg().getId()); + requestContext.getCurrentUser().getOrg().getId()); usr.addRole(RoleFactory.lookupByLabel("org_admin")); request.setupAddParameter("uid", usr.getId().toString()); forward = action.execute(mapping, form, request, response); @@ -112,7 +112,7 @@ public class DeleteUserActionTest extends RhnBaseTestCase { //successful delete User usr2 = UserTestUtils.createUser("testUser", - requestContext.getLoggedInUser().getOrg().getId()); + requestContext.getCurrentUser().getOrg().getId()); request.setupAddParameter("uid", usr2.getId().toString()); forward = action.execute(mapping, form, request, response); assertEquals(success, forward); diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/test/EditAddressActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/user/test/EditAddressActionTest.java index a39c4d5..0a3250f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/test/EditAddressActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/test/EditAddressActionTest.java @@ -76,7 +76,7 @@ public class EditAddressActionTest extends RhnBaseTestCase { // The logged in user needs to be the OrgAdmin of his Org in order // for him to be able to edit somebody else's address information. - User loggedInUser = requestContext.getLoggedInUser(); + User loggedInUser = requestContext.getCurrentUser(); loggedInUser.addRole(RoleFactory.ORG_ADMIN); UserManager.storeUser(loggedInUser); diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditActionTest.java index b8a556a..d18ef3a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditActionTest.java @@ -57,7 +57,7 @@ public class UserEditActionTest extends RhnBaseTestCase { mapping.addForwardConfig(success); mapping.addForwardConfig(failure); - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), + User user = UserManager.lookupUser(requestContext.getCurrentUser(), requestContext.getParamAsLong("uid")); request.setAttribute(RhnHelper.TARGET_USER, user); @@ -111,7 +111,7 @@ public class UserEditActionTest extends RhnBaseTestCase { mapping.addForwardConfig(success); mapping.addForwardConfig(failure); mapping.addForwardConfig(noaccess); - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), + User user = UserManager.lookupUser(requestContext.getCurrentUser(), requestContext.getParamAsLong("uid")); //Give the user org admin role diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/test/UserPrefActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/user/test/UserPrefActionTest.java index 2fcf961..9ecda6f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/test/UserPrefActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/test/UserPrefActionTest.java @@ -54,7 +54,7 @@ public class UserPrefActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); - User user = UserManager.lookupUser(requestContext.getLoggedInUser(), + User user = UserManager.lookupUser(requestContext.getCurrentUser(), requestContext.getParamAsLong("uid")); request.setAttribute(RhnHelper.TARGET_USER, user); // we have to get the actual user here so we can call setupAddParamter diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/AuthFilter.java b/java/code/src/com/redhat/rhn/frontend/servlets/AuthFilter.java index f3efc66..fe58de3 100644 --- a/java/code/src/com/redhat/rhn/frontend/servlets/AuthFilter.java +++ b/java/code/src/com/redhat/rhn/frontend/servlets/AuthFilter.java @@ -120,7 +120,7 @@ public class AuthFilter implements Filter { return; } } - User user = new RequestContext((HttpServletRequest)request).getLoggedInUser(); + User user = new RequestContext((HttpServletRequest)request).getCurrentUser(); if (user != null) { LoggingFactory.setLogAuth(user.getId()); } diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/LocalizedEnvironmentFilter.java b/java/code/src/com/redhat/rhn/frontend/servlets/LocalizedEnvironmentFilter.java index 0d81a51..1187945 100644 --- a/java/code/src/com/redhat/rhn/frontend/servlets/LocalizedEnvironmentFilter.java +++ b/java/code/src/com/redhat/rhn/frontend/servlets/LocalizedEnvironmentFilter.java @@ -76,7 +76,7 @@ public class LocalizedEnvironmentFilter implements Filter { private void initializeContext(HttpServletRequest request) { Context current = Context.getCurrentContext(); User user = new RequestContext(request) - .getLoggedInUser(); + .getCurrentUser(); setTimeZone(current, user, request); resolveLocale(current, user, request); } 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 c471c99..f3362da 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/BaseListAction.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/BaseListAction.java @@ -81,7 +81,7 @@ public abstract class BaseListAction extends RhnListAction { return null; } PageControl pc = new PageControl(); - pc.setPageSize(rctx.getLoggedInUser().getPageSize()); + pc.setPageSize(rctx.getCurrentUser().getPageSize()); return pc; } diff --git a/java/code/src/com/redhat/rhn/frontend/struts/BaseSetHelper.java b/java/code/src/com/redhat/rhn/frontend/struts/BaseSetHelper.java index a76391c..d7d977a 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/BaseSetHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/BaseSetHelper.java @@ -129,7 +129,7 @@ public class BaseSetHelper { String[] selected = ListTagHelper.getSelected(listName, request); RequestContext context = new RequestContext(request); - User user = context.getLoggedInUser(); + User user = context.getCurrentUser(); // If the user requested, first clear the SSM server set // Note: if the checkbox is selected, this executes regardless of whether or not diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java b/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java index a2258f2..a602863 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java @@ -152,7 +152,7 @@ public class RequestContext { * * @return Currently LOGged in User. */ - public User getLoggedInUser() { + private User getLoggedInUser() { /* * XMLRPC calls handle authentication on their own. We return null * because findUserSession is never going to correctly find an XMLRPC @@ -280,7 +280,7 @@ public class RequestContext { Long id = getRequiredParam(TOKEN_ID); ActivationKey key = ActivationKeyFactory.lookupByToken( TokenFactory.lookup(id, - getLoggedInUser().getOrg())); + getCurrentUser().getOrg())); request.setAttribute(ACTIVATION_KEY, key); } return (ActivationKey) request.getAttribute(ACTIVATION_KEY); @@ -303,7 +303,7 @@ public class RequestContext { if (request.getAttribute(ORG) == null) { Long id = getRequiredParam(ORG_ID); Org org = null; - if (getLoggedInUser().hasRole(RoleFactory.SAT_ADMIN)) { + if (getCurrentUser().hasRole(RoleFactory.SAT_ADMIN)) { org = OrgFactory.lookupById(id); } assertObjectFound(org, id, ORG_ID, "Org"); @@ -328,7 +328,7 @@ public class RequestContext { if (request.getAttribute(KICKSTART) == null) { Long id = getRequiredParam(KICKSTART_ID); KickstartData data = KickstartFactory. - lookupKickstartDataByIdAndOrg(getLoggedInUser().getOrg(), + lookupKickstartDataByIdAndOrg(getCurrentUser().getOrg(), id); assertObjectFound(data, id, KICKSTART_ID, "Kickstart Data"); request.setAttribute(KICKSTART, data); @@ -347,7 +347,7 @@ public class RequestContext { if (request.getAttribute(SERVER_GROUP) == null) { Long id = getRequiredParam(SERVER_GROUP_ID); ServerGroupManager manager = ServerGroupManager.getInstance(); - User user = getLoggedInUser(); + User user = getCurrentUser(); ManagedServerGroup sg = manager.lookup(id, user); if (sg == null) { String msg = "No server group with id = [%s] found."; diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnRequestProcessor.java b/java/code/src/com/redhat/rhn/frontend/struts/RhnRequestProcessor.java index de9ae4f..e9af177 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnRequestProcessor.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnRequestProcessor.java @@ -143,7 +143,7 @@ public class RhnRequestProcessor extends RequestProcessor { private void sendErrorEmail(HttpServletRequest request, Throwable e) { TraceBackEvent evt = new TraceBackEvent(); RequestContext requestContext = new RequestContext(request); - User usr = requestContext.getLoggedInUser(); + User usr = requestContext.getCurrentUser(); evt.setUser(usr); evt.setRequest(request); evt.setException(e); diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnSetHelper.java b/java/code/src/com/redhat/rhn/frontend/struts/RhnSetHelper.java index 0c68f4f..e7599ad 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnSetHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnSetHelper.java @@ -99,7 +99,7 @@ public class RhnSetHelper { * @return the newly updated set */ public RhnSet updateSet() { - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); RhnSet set = this.setDecl.get(user); String[] selected = request.getParameterValues("items_selected"); @@ -129,7 +129,7 @@ public class RhnSetHelper { */ public ActionForward selectall(DataResult dr, Map paramsIn) { - selectAllData(dr, requestContext.getLoggedInUser()); + selectAllData(dr, requestContext.getCurrentUser()); paramsIn.put("setupdated", "true"); paramsIn.put(RhnAction.SUBMITTED, "true"); @@ -183,7 +183,7 @@ public class RhnSetHelper { */ public ActionForward unselectall(Map paramsIn) { - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); this.setDecl.clear(user); paramsIn.put("setupdated", "true"); @@ -195,7 +195,7 @@ public class RhnSetHelper { * @return current User */ public User getUser() { - return requestContext.getLoggedInUser(); + return requestContext.getCurrentUser(); } diff --git a/java/code/src/com/redhat/rhn/frontend/struts/test/RequestContextTest.java b/java/code/src/com/redhat/rhn/frontend/struts/test/RequestContextTest.java index b34e2c1..c7c6bac 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/test/RequestContextTest.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/test/RequestContextTest.java @@ -54,7 +54,7 @@ public class RequestContextTest extends MockObjectTestCase { LoginActionTest ltest = new LoginActionTest(); HttpServletRequest request = ltest.loginUserIntoSessionTest(); RequestContext requestContext = new RequestContext(request); - assertNotNull(requestContext.getLoggedInUser()); + assertNotNull(requestContext.getCurrentUser()); } /** 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 2b503ce..8bfc705 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 @@ -61,7 +61,7 @@ public class RhnListActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); pc = new PageControl(); pc.setFilterColumn("Some column"); try { 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 1329d57..46498ad 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 @@ -61,7 +61,7 @@ public class RhnUnpagedListActionTest extends RhnBaseTestCase { RequestContext requestContext = new RequestContext(request); StrutsDelegate strutsDelegate = StrutsDelegate.getInstance(); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); lc = new ListControl(); lc.setFilterColumn("Some column"); try { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java b/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java index e18f537..345fb09 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/DWRItemSelector.java @@ -82,7 +82,7 @@ public class DWRItemSelector { } RhnSetDecl decl = RhnSetDecl.find(setLabel); if (decl != null) { - RhnSet set = decl.get(new RequestContext(req).getLoggedInUser()); + RhnSet set = decl.get(new RequestContext(req).getCurrentUser()); if (isOn) { set.addElements(which); } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/NavMenuTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/NavMenuTag.java index 11d8037..e8babe0 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/NavMenuTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/NavMenuTag.java @@ -95,7 +95,7 @@ public class NavMenuTag extends TagSupport { RequestContext requestContext = new RequestContext(req); Map aclContext = new HashMap(); - User user = requestContext.getLoggedInUser(); + User user = requestContext.getCurrentUser(); aclContext.put("user", user); // Add the formvar(s) to the context as well. if (nt.getFormvar() != null) { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/helpers/ListViewHelper.java b/java/code/src/com/redhat/rhn/frontend/taglibs/helpers/ListViewHelper.java index bcf6385..40cde35 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/helpers/ListViewHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/helpers/ListViewHelper.java @@ -52,7 +52,7 @@ public class ListViewHelper { this.ctx = requestContext; this.filterByField = filterField; // Default to the User's page size. Can be overriden by calling setPageSize() - this.pageSize = requestContext.getLoggedInUser().getPageSize(); + this.pageSize = requestContext.getCurrentUser().getPageSize(); } /** diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java index fb046d3..dad831b 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java @@ -1075,7 +1075,7 @@ public class ListTag extends BodyTagSupport { int tmp = -1; RequestContext rctx = new RequestContext( (HttpServletRequest) pageContext.getRequest()); - User user = rctx.getLoggedInUser(); + User user = rctx.getCurrentUser(); if (user != null) { tmp = user.getPageSize(); if (tmp > 0) { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/collection/WebRhnSet.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/collection/WebRhnSet.java index a8d7ec1..80f87f3 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/collection/WebRhnSet.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/collection/WebRhnSet.java @@ -50,7 +50,7 @@ public abstract class WebRhnSet extends SelectableWebList { HttpServletRequest request = getContext().getRequest(); helper = new RhnListSetHelper(request); RhnSetDecl decl = RhnSetDecl.find(getDecl()); - User user = getContext().getLoggedInUser(); + User user = getContext().getCurrentUser(); set = decl.get(user); super.setup(); } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemCurrencyIconDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemCurrencyIconDecorator.java index d8ba0d3..725bec3 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemCurrencyIconDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemCurrencyIconDecorator.java @@ -49,7 +49,7 @@ public class SystemCurrencyIconDecorator extends BaseListDecorator { (HttpServletRequest)getCurrentList().getContext().getRequest()); for (SystemCurrency next : systems) { - SystemListHelper.setSystemStatusDisplay(context.getLoggedInUser(), next, true); + SystemListHelper.setSystemStatusDisplay(context.getCurrentUser(), next, true); } } } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemIconDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemIconDecorator.java index 5a7378a..a7802e8 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemIconDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/SystemIconDecorator.java @@ -49,7 +49,7 @@ public class SystemIconDecorator extends BaseListDecorator { (HttpServletRequest)getCurrentList().getContext().getRequest()); for (SystemOverview next : systems) { - SystemListHelper.setSystemStatusDisplay(context.getLoggedInUser(), next, true); + SystemListHelper.setSystemStatusDisplay(context.getCurrentUser(), next, true); } } } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListRhnSetHelper.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListRhnSetHelper.java index 5657630..88a0ec1 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListRhnSetHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListRhnSetHelper.java @@ -203,7 +203,7 @@ public class ListRhnSetHelper extends ListSetHelper { decl = declIn.createCustom(params.entrySet().toArray()); } - set = decl.get(context.getLoggedInUser()); + set = decl.get(context.getCurrentUser()); helper = new RhnListSetHelper(context.getRequest()); } diff --git a/java/code/src/com/redhat/rhn/manager/acl/AclManager.java b/java/code/src/com/redhat/rhn/manager/acl/AclManager.java index fcd40c2..761bad4 100644 --- a/java/code/src/com/redhat/rhn/manager/acl/AclManager.java +++ b/java/code/src/com/redhat/rhn/manager/acl/AclManager.java @@ -46,7 +46,7 @@ public class AclManager { if (acl == null || "".equals(acl)) { return true; } - return hasAcl(acl, new RequestContext(request).getLoggedInUser(), mixins, + return hasAcl(acl, new RequestContext(request).getCurrentUser(), mixins, new HashMap(request.getParameterMap())); } diff --git a/java/code/src/com/redhat/rhn/testing/ActionHelper.java b/java/code/src/com/redhat/rhn/testing/ActionHelper.java index 8e62ce8..8725b46 100644 --- a/java/code/src/com/redhat/rhn/testing/ActionHelper.java +++ b/java/code/src/com/redhat/rhn/testing/ActionHelper.java @@ -76,7 +76,7 @@ public class ActionHelper extends Assert { RequestContext requestContext = new RequestContext(request); - user = UserManager.lookupUser(requestContext.getLoggedInUser(), + user = UserManager.lookupUser(requestContext.getCurrentUser(), requestContext.getParamAsLong("uid")); request.setAttribute(RhnHelper.TARGET_USER, user); // we have to get the actual user here so we can call setupAddParamter

10 years, 4 months

1
0
0 / 0

Changes to 'refs/tags/spacewalk-java-2.1.156-1'

by mkollar

Tag 'spacewalk-java-2.1.156-1' created by Matej Kollar <mkollar(a)redhat.com> at 2014-02-19 16:47 +0000 Tagging package [spacewalk-java] version [2.1.156-1] in directory [java/]. Changes since spacewalk-branding-2.1.33-1: Matej Kollar (1): Automatic commit of package [spacewalk-java] release [2.1.156-1]. Tomas Kasparek (2): 1009396 - escaping system name for /rhn/systems/ssm/provisioning/RemoteCommand.do 1009396 - escaping system name for /rhn/monitoring/config/ProbeSuiteSystemsEdit.do --- java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java | 8 ++++---- java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp | 4 ++-- java/spacewalk-java.spec | 8 +++++++- rel-eng/packages/spacewalk-java | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) ---

10 years, 4 months

1
0
0 / 0

java/spacewalk-java.spec rel-eng/packages

by mkollar

java/spacewalk-java.spec | 8 +++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 423c8c73ea3b5ef0de6b7be3bb2b25a434d679f4 Author: Matej Kollar <mkollar(a)redhat.com> Date: Wed Feb 19 17:47:38 2014 +0100 Automatic commit of package [spacewalk-java] release [2.1.156-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index aeb1960..802b1aa 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.155 +Version: 2.1.156 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -801,6 +801,12 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Wed Feb 19 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.156-1 +- 1009396 - escaping system name for + /rhn/monitoring/config/ProbeSuiteSystemsEdit.do +- 1009396 - escaping system name for + /rhn/systems/ssm/provisioning/RemoteCommand.do + * Tue Feb 18 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.155-1 - correct grammar - Fixing unclosed hr diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 4888449..82d2968 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.155-1 java/ +2.1.156-1 java/

10 years, 4 months

1
0
0 / 0

Branch 'master-bootstrap-css-fixes' - 57 commits - backend/satellite_tools backend/spacewalk-backend.spec branding/css branding/spacewalk-branding.spec client/rhel java/buildconf java/code java/licenses java/scripts java/spacewalk-java.spec rel-eng/comps rel-eng/packages schema/spacewalk spec-tree/bootstrap-datepicker spec-tree/jquery-timepicker web/modules web/spacewalk-web.spec

by Silvio Moioli

backend/satellite_tools/reposync.py | 4 backend/spacewalk-backend.spec | 5 - branding/css/spacewalk-tables.less | 2 branding/css/spacewalk-theme.less | 15 +-- branding/spacewalk-branding.spec | 30 +++++- client/rhel/rhn-client-tools/etc-conf/Makefile | 4 client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 + client/rhel/rhn-client-tools/src/actions/up2date_config.py | 44 --------- java/buildconf/apidoc/singlepage/apiindex.txt | 2 java/buildconf/build-taskdefs.xml | 16 +-- java/code/src/com/redhat/rhn/domain/user/UserServerPreferenceId.java | 2 java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java | 8 - java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/multiorg/ExtAuthRoleMappingAction.java | 1 java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java | 1 java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java | 1 java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java | 2 java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java | 10 -- java/code/src/com/redhat/rhn/frontend/nav/SidenavRenderer.java | 9 + java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java | 12 +- java/code/src/com/redhat/rhn/frontend/taglibs/FormatDateTag.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java | 4 java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 2 java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java | 10 +- java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelLabelException.java | 5 - java/code/src/com/redhat/rhn/manager/common/BaseFileListEditCommand.java | 1 java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 1 java/code/webapp/WEB-INF/decorators/layout_head.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp | 2 java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp | 2 java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp | 2 java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 4 java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 4 java/code/webapp/WEB-INF/pages/common/fragments/datepicker-with-label.jsp | 4 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp | 2 java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp | 2 java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 4 java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp | 2 java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp | 6 - java/code/webapp/WEB-INF/pages/profiles/details.jsp | 2 java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp | 2 java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp | 8 - java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/rebootsystem.jsp | 2 java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp | 2 java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp | 2 java/licenses/mx4j.html | 6 - java/scripts/jsp-check-helper.sed | 9 + java/scripts/jsp-check.sh | 21 ++++ java/spacewalk-java.spec | 30 ++++++ rel-eng/comps/comps-spacewalk-server-fedora18.xml | 2 rel-eng/comps/comps-spacewalk-server-fedora19.xml | 2 rel-eng/comps/comps-spacewalk-server-fedora20.xml | 2 rel-eng/comps/comps-spacewalk-server-rhel5.xml | 2 rel-eng/comps/comps-spacewalk-server-rhel6.xml | 2 rel-eng/packages/bootstrap-datepicker | 1 rel-eng/packages/jquery-timepicker | 1 rel-eng/packages/rhn-client-tools | 2 rel-eng/packages/spacewalk-backend | 2 rel-eng/packages/spacewalk-branding | 2 rel-eng/packages/spacewalk-java | 2 rel-eng/packages/spacewalk-schema | 2 rel-eng/packages/spacewalk-web | 2 schema/spacewalk/oracle/packages/rhn_channel.pkb | 34 +------ schema/spacewalk/postgres/packages/rhn_channel.pkb | 29 ++---- schema/spacewalk/spacewalk-schema.spec | 8 + schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.oracle | 34 +------ schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.postgresql | 28 +---- spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec | 47 ++++++++++ spec-tree/bootstrap-datepicker/tito.props | 3 spec-tree/jquery-timepicker/jquery-timepicker.spec | 43 +++++++++ spec-tree/jquery-timepicker/tito.props | 3 web/modules/pxt/PXT/ApacheHandler.pm | 8 + web/spacewalk-web.spec | 5 - 83 files changed, 351 insertions(+), 260 deletions(-) New commits: commit af9a8574068172b9ff9f89152b0dad168a585a20 Merge: de1a11a a208786 Author: Silvio Moioli <smoioli(a)suse.de> Date: Wed Feb 19 17:38:15 2014 +0100 Merge remote-tracking branch 'origin/master' into master-bootstrap-css-fixes Conflicts: java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp diff --cc java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp index 99bc5e7,1104d1c..2eb4f9d --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp @@@ -55,11 -55,11 +55,11 @@@ <html:hidden property="suite_id" value="${probeSuite.id}"/> <c:if test="${not empty pageList}"> <div class="text-right"> - <hr> - <hr /> - <html:submit property="dispatch"> ++ <hr /> + <html:submit styleClass="btn btn-default" property="dispatch"> <bean:message key="probesuitesystems.jsp.detachsystem"/> </html:submit> - <html:submit property="dispatch"> + <html:submit styleClass="btn btn-default" property="dispatch"> <bean:message key="probesuitesystems.jsp.removesystem"/> </html:submit> </div> diff --cc java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp index 6a2f43d,1d2f733..6eacb94 --- a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp @@@ -27,8 -27,8 +27,8 @@@ <html:hidden property="sid" value="${system.id}"/> <html:hidden property="submitted" value="true"/> </table> - <hr> + <hr /> - <div class="text-right"><html:submit><bean:message key="kickstart.session_cancel.jsp.cancel"/></html:submit></div> + <div class="text-right"><html:submit styleClass="btn btn-default"><bean:message key="kickstart.session_cancel.jsp.cancel"/></html:submit></div> </html:form> </body> </html> commit a2087866cfd1d36d8927c5709ae8e748264e01a8 Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 19:55:51 2014 +0100 Automatic commit of package [spacewalk-branding] release [2.1.33-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index f58ecb3..757f6e0 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -9,7 +9,7 @@ %endif Name: spacewalk-branding -Version: 2.1.32 +Version: 2.1.33 Release: 1%{?dist} Summary: Spacewalk branding data @@ -89,6 +89,9 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Tue Feb 18 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.33-1 +- The fix should have been the other way round... + * Tue Feb 18 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.32-1 - do not use fixed size - add space after alphabar result sign diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index be52c9c..59395bd 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -2.1.32-1 branding/ +2.1.33-1 branding/ commit 3a46ec842fe627c046adf63e8d19b683ea47c7ea Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 19:52:58 2014 +0100 The fix should have been the other way round... diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 012f911..f58ecb3 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -27,7 +27,7 @@ Requires: httpd Requires: bootstrap <= 3.0.0 Requires: bootstrap-datepicker Requires: font-awesome >= 4.0.0 -Requires: jquery-timepicker <= 1.3.3 +Requires: jquery-timepicker >= 1.3.2 Requires: roboto >= 1.2 Requires: pwstrength-bootstrap commit 093fbdf79a8e141ffcc67a9a5accd708844e6e08 Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 17:05:26 2014 +0100 Automatic commit of package [spacewalk-branding] release [2.1.32-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 726de2a..012f911 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -9,7 +9,7 @@ %endif Name: spacewalk-branding -Version: 2.1.31 +Version: 2.1.32 Release: 1%{?dist} Summary: Spacewalk branding data @@ -89,6 +89,10 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Tue Feb 18 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.32-1 +- do not use fixed size +- add space after alphabar result sign + * Mon Feb 17 2014 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.31-1 - 1064573 - sidenav css should respect valid html constructions diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index 4ad39b7..be52c9c 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -2.1.31-1 branding/ +2.1.32-1 branding/ commit a0b0f4e939c03436bb7a4069a82ef59616dc6d03 Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 17:02:02 2014 +0100 Automatic commit of package [spacewalk-java] release [2.1.155-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index f2f724a..aeb1960 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.154 +Version: 2.1.155 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -801,6 +801,14 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Feb 18 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.155-1 +- correct grammar +- Fixing unclosed hr +- Fixing unclosed br +- Fixing unclosed meta +- Simple attempt to find problematic things in jsps +- don't add & twice to the parameters of the url + * Mon Feb 17 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.154-1 - 1064573 - make sidenav html valid diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 7cd8d7d..4888449 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.154-1 java/ +2.1.155-1 java/ commit f5f14c667c5e0f274d5345a3b2aa1cac2fa688e9 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Feb 18 16:40:39 2014 +0100 correct grammar 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 5ace5ac..7565856 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 @@ -15082,7 +15082,7 @@ any of these revisions. Are you sure you want to do this?</source> <source>Script does not contain shell definition.</source> </trans-unit> <trans-unit id="stringutil.scriptcheck.error.noscript"> - <source>Script is does not seems like doing anything.</source> + <source>Script does not seem doing anything.</source> </trans-unit>  <trans-unit id="ssm.patches.list.header"> commit fe17c57dfa73ad7bc12423c8a3d374c4833897ae Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 16:21:17 2014 +0100 Fixing unclosed hr diff --git a/java/buildconf/apidoc/singlepage/apiindex.txt b/java/buildconf/apidoc/singlepage/apiindex.txt index cca8bbd..407a64a 100644 --- a/java/buildconf/apidoc/singlepage/apiindex.txt +++ b/java/buildconf/apidoc/singlepage/apiindex.txt @@ -4,4 +4,4 @@ <li><a href="#${handler.name}">$handler.name</a></li> #end </ul> -<hr> +<hr /> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp index bb0a1b6..1104d1c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystems.jsp @@ -55,7 +55,7 @@ <html:hidden property="suite_id" value="${probeSuite.id}"/> <c:if test="${not empty pageList}"> <div class="text-right"> - <hr> + <hr /> <html:submit property="dispatch"> <bean:message key="probesuitesystems.jsp.detachsystem"/> </html:submit> diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp index 059d0cd..c4f1468 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp @@ -35,7 +35,7 @@ <html:hidden property="suite_id" value="${probeSuite.id}"/> <c:if test="${not empty pageList}"> <div class="text-right"> - <hr><bean:message key="probesuitesystemsedit.jsp.monscouttouse"/> + <hr /><bean:message key="probesuitesystemsedit.jsp.monscouttouse"/> <select name="satCluster"> <c:forEach items="${satClusters}" var="cluster"> <option value="${cluster.id}">${cluster.description}</option> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp index d8a1ce4..2cdb954 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp @@ -52,7 +52,7 @@ function modifyUploadCheckbox(checkbox) { </div> <div class="panel-body"> <p><bean:message key="orgconfig.jsp.description"/></p> - <hr> + <hr /> <form method="post" class="form-horizontal" action="/rhn/admin/multiorg/OrgConfigDetails.do"> diff --git a/java/code/webapp/WEB-INF/pages/profiles/details.jsp b/java/code/webapp/WEB-INF/pages/profiles/details.jsp index 28303a4..4b79638 100644 --- a/java/code/webapp/WEB-INF/pages/profiles/details.jsp +++ b/java/code/webapp/WEB-INF/pages/profiles/details.jsp @@ -15,7 +15,7 @@ <bean:message key="profile.details.summary"/> </div> - <hr> + <hr /> <table class="details"> <tr> diff --git a/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp b/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp index 2e4d85a..90cbd9d 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/provisioning-remote-command.jsp @@ -60,7 +60,7 @@ </tbody> </table> <html:hidden property="submitted" value="true"/> - <div class="text-right"><hr> + <div class="text-right"><hr /> <input type="submit" name="schedule_remote_command" value="<bean:message key='ssm.operations.provisioning.remotecommand.form.submit'/>"> <input type="hidden" name="use_date" value="true" /> </div> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp index cfce89c..1d2f733 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_cancel.jsp @@ -27,7 +27,7 @@ <html:hidden property="sid" value="${system.id}"/> <html:hidden property="submitted" value="true"/> </table> - <hr> + <hr /> <div class="text-right"><html:submit><bean:message key="kickstart.session_cancel.jsp.cancel"/></html:submit></div> </html:form> </body> diff --git a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp index 9cb5b05..2ceda65 100644 --- a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp +++ b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp @@ -20,7 +20,7 @@ <p> <bean:message key="your_edit_address.jsp.summary" /> </p> - <hr> + <hr /> <html:form action="/account/EditAddressSubmit" styleClass="form-horizontal"> <rhn:csrf /> <%@ include file="/WEB-INF/pages/common/fragments/user/edit_address_form.jspf" %> diff --git a/java/licenses/mx4j.html b/java/licenses/mx4j.html index a895cd4..f0e71f0 100644 --- a/java/licenses/mx4j.html +++ b/java/licenses/mx4j.html @@ -1,4 +1,4 @@ -<html><head><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>License</title><link href="styles.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.66.1" name="generator"><link rel="start" href="index.html" title="MX4J English Documentation"><link rel="up" href="ch01.html" title="Chapter 1. MX4J and JMX Overview"><link rel="prev" href="ch01.html" title="Chapter 1. MX4J and JMX Overview"><link rel="next" href="ch02.html" title="Chapter 2. JMX 1.2 Explained"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">License</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="ch01.html">Prev</a> </td><th align="center" width="60%">Chapter 1. MX4J and JMX Overview</th><td align="right" width="20%"> <a accesskey="n" href="ch02.h tml">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="N10070"></a>License</h2></div></div></div><p> +<html><head><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>License</title><link href="styles.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.66.1" name="generator"><link rel="start" href="index.html" title="MX4J English Documentation"><link rel="up" href="ch01.html" title="Chapter 1. MX4J and JMX Overview"><link rel="prev" href="ch01.html" title="Chapter 1. MX4J and JMX Overview"><link rel="next" href="ch02.html" title="Chapter 2. JMX 1.2 Explained"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">License</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="ch01.html">Prev</a> </td><th align="center" width="60%">Chapter 1. MX4J and JMX Overview</th><td align="right" width="20%"> <a accesskey="n" href="ch02.h tml">Next</a></td></tr></table><hr /></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="N10070"></a>License</h2></div></div></div><p> MX4J is released under an Apache-style license. In practice this means that you can do almost anything you want with the code, including its use in commercial software. <br /> @@ -57,4 +57,4 @@ individuals on behalf of MX4J. For more information on MX4J, please see <a href="http://mx4j.sourceforge.net" target="_top">http://mx4j.sourceforge.net</a> </pre> - </p></div><div class="navfooter"><hr><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="ch01.html">Prev</a> </td><td align="center" width="20%"><a accesskey="u" href="ch01.html">Up</a></td><td align="right" width="40%"> <a accesskey="n" href="ch02.html">Next</a></td></tr><tr><td valign="top" align="left" width="40%">Chapter 1. MX4J and JMX Overview </td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td valign="top" align="right" width="40%"> Chapter 2. JMX 1.2 Explained</td></tr></table></div></body></html> \ No newline at end of file + </p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="ch01.html">Prev</a> </td><td align="center" width="20%"><a accesskey="u" href="ch01.html">Up</a></td><td align="right" width="40%"> <a accesskey="n" href="ch02.html">Next</a></td></tr><tr><td valign="top" align="left" width="40%">Chapter 1. MX4J and JMX Overview </td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td valign="top" align="right" width="40%"> Chapter 2. JMX 1.2 Explained</td></tr></table></div></body></html> \ No newline at end of file commit c87d9c091ff968b1971b59f77d85b108273ac6f7 Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 16:20:21 2014 +0100 Fixing unclosed br diff --git a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java index f782406..6beea08 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/monitoring/ServerProbeDto.java @@ -77,7 +77,7 @@ public class ServerProbeDto extends CheckProbeDto { } /** - * Get a HTML friendly status string. Replaces \n and \r\n with <br> + * Get a HTML friendly status string. Replaces \n and \r\n with <br /> * @return HTML friendly string */ public String getStateOutputString() { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java index 5af7c6e..ac53522 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java @@ -32,7 +32,7 @@ import org.apache.commons.lang.StringUtils; * <rhn:address type=MAILING> * </pre> * This outputs a table row tag containing a Header column, address info - * and a link to edit the address.<br> + * and a link to edit the address.<br /> * <pre> * Mailing: 444 Castro * Mountain View, CA 94043 @@ -178,10 +178,10 @@ public class AddressTag extends TagSupport { result.append("<address>"); // Address 1 and 2 result.append(address.getAddress1()); - result.append("<br>"); + result.append("<br />"); if (StringUtils.isNotBlank(address.getAddress2())) { result.append(address.getAddress2()); - result.append("<br>"); + result.append("<br />"); } // City @@ -193,18 +193,18 @@ public class AddressTag extends TagSupport { result.append(" "); result.append(address.getZip()); - result.append("<br>"); + result.append("<br />"); // Phones result.append(ls.getMessage("phone")); result.append(": "); result.append(address.getPhone()); - result.append("<br>"); + result.append("<br />"); if (StringUtils.isNotBlank(address.getFax())) { result.append(ls.getMessage("fax")); result.append(": "); result.append(address.getFax()); - result.append("<br>"); + result.append("<br />"); } result.append("</address>"); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/FormatDateTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/FormatDateTag.java index a485584..aa5cd33 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/FormatDateTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/FormatDateTag.java @@ -36,7 +36,7 @@ import javax.servlet.jsp.tagext.TagSupport; * Displays a value in a human format (eg. 3 minutes ago) * <pre> * <rhn:human-value value="${bean.value}"> - * </pre> Outputs a human readable text for the value relative to now.<br> + * </pre> Outputs a human readable text for the value relative to now.<br /> * */ public class FormatDateTag extends TagSupport { diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java index b8afaee..f846605 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java @@ -31,7 +31,7 @@ import com.redhat.rhn.manager.acl.AclManager; * <rhn:toolbar base="h1" img="/img/somegraphic.gif"> * </pre> * <p> - * Basic Attributes:<br> + * Basic Attributes:<br /> * <ul> * <li>base - base html tag for wrapping the toolbar. * <li>icon - name of the icon (css class) to be displayed to the left of the page title @@ -41,7 +41,7 @@ import com.redhat.rhn.manager.acl.AclManager; * <li>helpUrl - link to the help pages. * </ul> * <P> - * Action Attributes:<br> + * Action Attributes:<br /> * <ul> * <li>create button * <ul> diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java index 9ca2f20..d215be6 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java @@ -90,11 +90,11 @@ public class AddressTagTest extends RhnBaseTestCase { private String getPopulatedReturnValue(HttpServletRequest req, Long uid) { return "<strong>Mailing Address</strong>" + - "<address>444 Castro<br>" + - "#1<br>" + - "Mountain View, CA 94043<br>" + - "Phone: 650-555-1212<br>" + - "Fax: 650-555-1212<br>" + + "<address>444 Castro<br />" + + "#1<br />" + + "Mountain View, CA 94043<br />" + + "Phone: 650-555-1212<br />" + + "Fax: 650-555-1212<br />" + "</address>" + "<p>" + "<a class=\"btn btn-primary\" href=\"/EditAddress.do?type=M&uid=" + diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp index c2075c2..b726717 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/notification/filters.jsp @@ -26,7 +26,7 @@ <rhn:dialogmenu mindepth="0" maxdepth="1" definition="/WEB-INF/nav/filters.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" /> - <br> + <br /> <rhn:list pageList="${requestScope.pageList}" noDataText="filters.jsp.nofilters"> <%-- There is only one list, but we have to define the same columns diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp index ad64684..2011d92 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp @@ -30,7 +30,7 @@ <table class="details" width="80%"> - <tr><bean:message key="channel.manage.errata.custommsg"/><br><br></tr> + <tr><bean:message key="channel.manage.errata.custommsg"/><br /><br /></tr> <tr> <th>Package Association:</th> @@ -73,7 +73,7 @@ </table> - <br><br> + <br /><br /> <c:choose> <c:when test="${pageList != null}"> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp index 7cbcc3b..96d5111 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp @@ -30,7 +30,7 @@ <table class="details" width="80%"> - <tr><bean:message key="channel.manage.errata.redhatmsg" /><br><br></tr> + <tr><bean:message key="channel.manage.errata.redhatmsg" /><br /><br /></tr> <tr> <th>Package Association:</th> @@ -95,7 +95,7 @@ </table> - <br><br> + <br /><br /> <c:choose> <c:when test="${pageList != null}"> diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp index 5e760dd..359cb82 100644 --- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp @@ -11,9 +11,9 @@ <body> <%@ include file="/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf" %> -<br><br> +<br /><br /> <bean:message key="channel.manage.errata.confirmmsg"/> -<br><br> +<br /><br /> <rl:listset name="packageConfirm"> <rhn:csrf /> <rhn:submitted /> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf index 5142e5b..3844b28 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/cobbler-variables.jspf @@ -11,7 +11,7 @@ <c:if test= "${not empty param.summary}"> <p><bean:message key="${param.summary}"/></p> </c:if> - <br> + <br /> <html:form method="post" action="${param.post_url}"> <rhn:csrf /> <table class="details"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp index 0e434b2..ab8a3c4 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp @@ -30,7 +30,7 @@ <rhn:require acl="user_role(org_admin)"> <li class="list-group-item"> <rhn:icon type="nav-bullet" /> <bean:message - key="yourrhn.jsp.task.manage_subscriptions" /> <br> + key="yourrhn.jsp.task.manage_subscriptions" /> <br /> &ensp; &ensp;<a href="/rhn/systems/SystemEntitlements.do"> <bean:message key="header.jsp.my_organization" /> </a> <strong>|</strong> <a diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp index 4b7127d..bd65ca8 100644 --- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp +++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp @@ -81,7 +81,7 @@ /> </rl:column> </rl:list> - <br> + <br /> <c:import url="/WEB-INF/pages/common/fragments/configuration/sdc/viewmodifyfileactions.jspf"/> </rl:listset> </body> diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp index 725dc7b..67b260b 100644 --- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp +++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp @@ -213,7 +213,7 @@ <rhn:highlight tag="strong" text="${search_string}"> <c:out value="${name}"/> </rhn:highlight> - <br> + <br /> </c:forEach> </rl:column> </c:when> @@ -241,7 +241,7 @@ ${cve.name} </rhn:highlight> </a> - <br> + <br /> </c:forEach> </rl:column> </c:when> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp index f0d0653..e00cea5 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartoverview.jsp @@ -29,7 +29,7 @@ </div> </div> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/currently-kickstarted-systems.jspf" %> -<br><br> +<br /><br /> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/systems-tobe-kickstarted.jspf" %> </rl:listset> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp index f0ea006..5441b6e 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp @@ -66,7 +66,7 @@ function clickNewestTree() { property="value" labelProperty="label" /> </html:select> - <br><span class="small-text"><bean:message key="softwareedit.jsp.tip" /></span><br> + <br /><span class="small-text"><bean:message key="softwareedit.jsp.tip" /></span><br /> </td> </tr> <tr> @@ -83,10 +83,10 @@ function clickNewestTree() { </c:forEach> </c:when> <c:otherwise> - <br><b><bean:message key="softwareedit.jsp.nochildchannels" /></b><br> + <br /><b><bean:message key="softwareedit.jsp.nochildchannels" /></b><br /> </c:otherwise> </c:choose> - <br><span class="small-text"><bean:message key="softwareedit.jsp.warning" arg0="${ksdata.id}"/></span><br> + <br /><span class="small-text"><bean:message key="softwareedit.jsp.warning" arg0="${ksdata.id}"/></span><br /> </td> </tr> <tr> diff --git a/java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp b/java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp index 4f29828..31b8d84 100644 --- a/java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp +++ b/java/code/webapp/WEB-INF/pages/rhnpackage/changelog.jsp @@ -18,7 +18,7 @@ <c:if test="${changelog != null}"> <c:forEach items="${changelog}" var="line"> - ${line}<br> + ${line}<br /> </c:forEach> </c:if> <c:if test="${changelog == null}"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp index 79313a1..7c845ed 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/patches/patchinstall.jsp @@ -35,7 +35,7 @@ </rhn:column> <rhn:column header="packagelist.jsp.packagesaffected"> <c:forEach var="item" items="${current.elabNvre}"> - ${item}<br> + ${item}<br /> </c:forEach> </rhn:column> </rhn:listdisplay> diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp index 6e00ea1..325bb53 100644 --- a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp @@ -56,16 +56,16 @@ <p> <bean:message key="physicalhosts.jsp.para2" /> </p> - <br> + <br /> - <strong><bean:message key="physicalhosts.jsp.guestsofknown" /></strong><br> + <strong><bean:message key="physicalhosts.jsp.guestsofknown" /></strong><br /> <p> <ul> <li><bean:message key="physicalhosts.jsp.knownnote" /></li> <li><bean:message key="physicalhosts.jsp.note3" /></li> </ul> </p> - <strong><bean:message key="physicalhosts.jsp.guestsofunknown" /></strong><br> + <strong><bean:message key="physicalhosts.jsp.guestsofunknown" /></strong><br /> <p> <bean:message key="physicalhosts.jsp.unknownnote" /> <ul> @@ -73,7 +73,7 @@ <li><bean:message key="physicalhosts.jsp.note3" /></li> </ul> </p> - <strong><bean:message key="physicalhosts.jsp.guestsofnonredhat" /></strong><br> + <strong><bean:message key="physicalhosts.jsp.guestsofnonredhat" /></strong><br /> <p> <bean:message key="physicalhosts.jsp.nonredhatnote" /> </p> diff --git a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp index 6352437..af9888a 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp @@ -140,7 +140,7 @@ <c:if test="${requestScope.show_graph}"> <h2><bean:message key="probedetails.jsp.graph"/></h2> <img src="/rhn/systems/details/probes/ProbeGraph.do?${requestScope.l10ned_selected_metrics_string}${requestScope.selected_metrics_string}startts=${requestScope.startts}&endts=${requestScope.endts}&sid=${system.id}&probe_id=${probe.id}"/> - <br><a href="/rhn/systems/details/probes/ProbeGraph.do?lde=1&${requestScope.l10ned_selected_metrics_string}${requestScope.selected_metrics_string}startts=${requestScope.startts}&endts=${requestScope.endts}&sid=${system.id}&probe_id=${probe.id}"><rhn:icon type="item-download-csv" /><bean:message key="listdisplay.csv"/></a> + <br /><a href="/rhn/systems/details/probes/ProbeGraph.do?lde=1&${requestScope.l10ned_selected_metrics_string}${requestScope.selected_metrics_string}startts=${requestScope.startts}&endts=${requestScope.endts}&sid=${system.id}&probe_id=${probe.id}"><rhn:icon type="item-download-csv" /><bean:message key="listdisplay.csv"/></a> </c:if> <c:if test="${requestScope.show_log}"> <h2><bean:message key="probedetails.jsp.eventlog"/></h2> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp index 5f3c27e..ac890f4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/deletecustomdata.jsp @@ -6,7 +6,7 @@ <html:html > <body> -<br> +<br /> <div> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/rebootsystem.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/rebootsystem.jsp index 6e03b4a..e619a39 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/rebootsystem.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/rebootsystem.jsp @@ -21,7 +21,7 @@ </div> <div class="panel-body"> <bean:message key="reboot.jsp.summary" /> - <br> + <br /> <bean:message key="reboot.jsp.widgetsummary"/> <form action="/rhn/systems/details/RebootSystem.do?sid=${sid}" method="post" class="form-horizontal"> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp index 420d8c1..23f7849 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/updatecustomdata.jsp @@ -8,7 +8,7 @@ <html:html > <body> -<br> +<br /> <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %> diff --git a/java/licenses/mx4j.html b/java/licenses/mx4j.html index 22a13da..a895cd4 100644 --- a/java/licenses/mx4j.html +++ b/java/licenses/mx4j.html @@ -1,7 +1,7 @@ <html><head><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>License</title><link href="styles.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.66.1" name="generator"><link rel="start" href="index.html" title="MX4J English Documentation"><link rel="up" href="ch01.html" title="Chapter 1. MX4J and JMX Overview"><link rel="prev" href="ch01.html" title="Chapter 1. MX4J and JMX Overview"><link rel="next" href="ch02.html" title="Chapter 2. JMX 1.2 Explained"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">License</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="ch01.html">Prev</a> </td><th align="center" width="60%">Chapter 1. MX4J and JMX Overview</th><td align="right" width="20%"> <a accesskey="n" href="ch02.h tml">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="N10070"></a>License</h2></div></div></div><p> MX4J is released under an Apache-style license. In practice this means that you can do almost anything you want with the code, including its - use in commercial software. <br> + use in commercial software. <br /> The actual text of the license is included below: </p><p> <pre class="literallayout"> commit 945556006501408526aa3bd00eba46616c107b8e Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 16:12:39 2014 +0100 Fixing unclosed meta diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp index f03a3fa..54a106a 100644 --- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp +++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp @@ -27,7 +27,7 @@ <link rel="stylesheet" href="/fonts/font-awesome/css/font-awesome.css" /> <link rel="stylesheet" href="/fonts/font-spacewalk/css/spacewalk-font.css" /> - <meta name="viewport" content="initial-scale=1"> + <meta name="viewport" content="initial-scale=1" /> <rhn:require acl="is(development_environment)"> <link rel="stylesheet/less" type="text/css" href="/css/spacewalk.less" /> commit 0e2a644ade8e5c488715d3fea7daef94b7a95e61 Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 16:10:28 2014 +0100 Simple attempt to find problematic things in jsps work in progress diff --git a/java/scripts/jsp-check-helper.sed b/java/scripts/jsp-check-helper.sed new file mode 100644 index 0000000..6065489 --- /dev/null +++ b/java/scripts/jsp-check-helper.sed @@ -0,0 +1,9 @@ +s/<%\@\s\+$taglib\|page$ $[^%]\|%[^>]$*%>//g +s/<%$[^%]\|%[^>]$*%>/aaa/g +s/<bean:message [^>]*\/>/bean text/g +s/<decorator:getProperty [^>]*\/>/something/g +s/<c:out [^>]*\/>/out something/g +s/<$\/\?[^:> ]*$:/<\1_/g +s/^/<xml>/ +s/$/<\/xml>/ +s/<!DOCTYPE [^>]*>// diff --git a/java/scripts/jsp-check.sh b/java/scripts/jsp-check.sh new file mode 100644 index 0000000..170e4ef --- /dev/null +++ b/java/scripts/jsp-check.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +SCRIPTDIR=$( dirname $( readlink --canonicalize $0 ) ) +SED_HELPER=$SCRIPTDIR/jsp-check-helper.sed + +# Run me in Spacewalk git root... + +# | xargs -n 1 bash -c "tr '\\n' ' ' < \$1 | sed -f $SED_HELPER | xmllint - >& /dev/null ; if [[ \$? -ne 0 ]]; then echo \$1; fi" -- + +echo "Potential problems:" >&2 +git locate '*.jsp*' \ +| grep 'jspf\?$' \ +| while read; do + FILE=$REPLY + tr '\n' ' ' < "$FILE" \ + | sed -f "$SED_HELPER" \ + | xmllint - >& /dev/null + if [[ $? -ne 0 ]]; then + echo "$FILE" + fi +done commit d00f25d216b544890fd176fb2e67ee1307fdc9a8 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Feb 18 16:20:22 2014 +0100 Automatic commit of package [spacewalk-backend] release [2.1.51-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index ba654c8..f746f1d 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 2.1.50 +Version: 2.1.51 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -632,6 +632,9 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py* %changelog +* Tue Feb 18 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.51-1 +- 1064296 - rename variable so it doesn't colide with reserved word + * Fri Feb 14 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.50-1 - query should not end with semicolon in oracle diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index c110da5..8ffd429 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -2.1.50-1 backend/ +2.1.51-1 backend/ commit fe9029fe397336c561f1be28deb5d9a2ad9fe6e7 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Tue Feb 18 16:17:05 2014 +0100 1064296 - rename variable so it doesn't colide with reserved word diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py index f3e2352..d336a88 100644 --- a/backend/satellite_tools/reposync.py +++ b/backend/satellite_tools/reposync.py @@ -620,7 +620,7 @@ class RepoSync(object): insert_h = rhnSQL.prepare(""" insert into rhnKSTreeFile (kstree_id, relative_filename, checksum_id, file_size, last_modified, created, modified) - values (:id, :path, lookup_checksum('sha256', :checksum), :size, epoch_seconds_to_timestamp_tz(:st_time), current_timestamp, current_timestamp) + values (:id, :path, lookup_checksum('sha256', :checksum), :st_size, epoch_seconds_to_timestamp_tz(:st_time), current_timestamp, current_timestamp) """) dirs = [ '' ] while len(dirs) > 0: @@ -646,7 +646,7 @@ class RepoSync(object): print "Retrieving %s" % d + s plug.get_file(d + s, os.path.join(CFG.MOUNT_POINT, ks_path)) st = os.stat(local_path) - insert_h.execute(id = ks_id, path = d + s, checksum = getFileChecksum('sha256', local_path), size = st.st_size, st_time = st.st_mtime) + insert_h.execute(id = ks_id, path = d + s, checksum = getFileChecksum('sha256', local_path), st_size = st.st_size, st_time = st.st_mtime) rhnSQL.commit() commit e105488077adcd94986f59772416e9d97b38ea81 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Feb 18 14:33:28 2014 +0100 Automatic commit of package [spacewalk-schema] release [2.1.47-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 24217df..7bfff01 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -2.1.46-1 schema/spacewalk/ +2.1.47-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 83986ab..61721cd 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -4,7 +4,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 2.1.46 +Version: 2.1.47 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Tue Feb 18 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.47-1 +- 1063821 - update rhnServer after queue_server to avoid a deadlock + * Mon Feb 17 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.46-1 - 1063821 - fix ORA-01422 error when removing a channel commit 062bebf04d5a627a4bcf646a58aa4f41d54eadb8 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Tue Feb 18 14:28:31 2014 +0100 1063821 - update rhnServer after queue_server to avoid a deadlock There's no need to be locking rhnServerNeededCache, as long as we move update rhnServer after rhnServerNeededCache modification (to enforce serialization). diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb index c0f5482..c03b667 100644 --- a/schema/spacewalk/oracle/packages/rhn_channel.pkb +++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb @@ -61,7 +61,6 @@ IS consenting_user NUMBER; allowed number := 0; is_fve CHAR(1) := 'N'; - update_lock number; BEGIN if user_id_in is not null then allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe'); @@ -156,23 +155,16 @@ IS where c.id = channel_id_in ); - begin - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - exception WHEN no_data_found THEN - null; - end; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve); IF recalcfamily_in > 0 THEN rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val); END IF; queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; ELSE rhn_exception.raise_exception('channel_family_no_subscriptions'); END IF; @@ -464,7 +456,6 @@ IS server_org_id_val NUMBER; available_subscriptions NUMBER; server_already_in_chan BOOLEAN; - update_lock number; cursor channel_family_is_proxy(channel_family_id_in in number) is select 1 from rhnChannelFamily @@ -516,7 +507,6 @@ IS END IF; if deleting_server = 0 then - insert into rhnServerHistory (id,server_id,summary,details) ( select rhn_event_id_seq.nextval, server_id_in, @@ -525,24 +515,16 @@ IS from rhnChannel c where c.id = channel_id_in ); - - begin - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - exception when no_data_found then - null; - end; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; end if; DELETE FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in; if deleting_server = 0 then queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; end if; channel_family_id_val := rhn_channel.family_for_channel(channel_id_in); diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb b/schema/spacewalk/postgres/packages/rhn_channel.pkb index 02c998b..307d618 100644 --- a/schema/spacewalk/postgres/packages/rhn_channel.pkb +++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 5abe0e2ce13d05c06619611ef8e25e443de89d1d +-- oracle equivalent source sha1 2e2fac296f948ee69f0ab14fec74b664eca814b5 -- -- Copyright (c) 2008--2013 Red Hat, Inc. -- @@ -65,7 +65,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ consenting_user NUMERIC; allowed numeric; is_fve_char char(1) := 'N'; - update_lock numeric; BEGIN if user_id_in is not null then allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe'); @@ -149,19 +148,17 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ where c.id = channel_id_in ); - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve_char); IF recalcfamily_in > 0 THEN perform rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val); END IF; + perform queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; ELSE perform rhn_exception.raise_exception('channel_family_no_subscriptions'); END IF; @@ -491,7 +488,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ server_org_id_val NUMERIC; available_subscriptions NUMERIC; server_already_in_chan BOOLEAN; - update_lock numeric; channel_family_is_proxy cursor(channel_family_id_in numeric) for select 1 from rhnChannelFamily @@ -534,7 +530,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ END IF; if deleting_server = 0 then - insert into rhnServerHistory (id,server_id,summary,details) ( select nextval('rhn_event_id_seq'), server_id_in, @@ -543,20 +538,16 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ from rhnChannel c where c.id = channel_id_in ); - - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; end if; DELETE FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in; if deleting_server = 0 then perform queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; end if; channel_family_id_val := rhn_channel.family_for_channel(channel_id_in); diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.oracle index 80f5511..06f91e8 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.oracle +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.oracle @@ -61,7 +61,6 @@ IS consenting_user NUMBER; allowed number := 0; is_fve CHAR(1) := 'N'; - update_lock number; BEGIN if user_id_in is not null then allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe'); @@ -156,23 +155,16 @@ IS where c.id = channel_id_in ); - begin - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - exception WHEN no_data_found THEN - null; - end; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve); IF recalcfamily_in > 0 THEN rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val); END IF; queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; ELSE rhn_exception.raise_exception('channel_family_no_subscriptions'); END IF; @@ -464,7 +456,6 @@ IS server_org_id_val NUMBER; available_subscriptions NUMBER; server_already_in_chan BOOLEAN; - update_lock number; cursor channel_family_is_proxy(channel_family_id_in in number) is select 1 from rhnChannelFamily @@ -516,7 +507,6 @@ IS END IF; if deleting_server = 0 then - insert into rhnServerHistory (id,server_id,summary,details) ( select rhn_event_id_seq.nextval, server_id_in, @@ -525,24 +515,16 @@ IS from rhnChannel c where c.id = channel_id_in ); - - begin - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - exception when no_data_found then - null; - end; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; end if; DELETE FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in; if deleting_server = 0 then queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; end if; channel_family_id_val := rhn_channel.family_for_channel(channel_id_in); diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.postgresql index 7baba7b..ecfb421 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.postgresql +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.postgresql @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 c32b134834133c1642e86f58782416d79004b52b +-- oracle equivalent source sha1 ff46072fee2cd6e7793a2fd52e16526ec6e4d062 -- -- Copyright (c) 2008--2013 Red Hat, Inc. -- @@ -65,7 +65,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ consenting_user NUMERIC; allowed numeric; is_fve_char char(1) := 'N'; - update_lock numeric; BEGIN if user_id_in is not null then allowed := rhn_channel.user_role_check(channel_id_in, user_id_in, 'subscribe'); @@ -149,19 +148,16 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ where c.id = channel_id_in ); - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; INSERT INTO rhnServerChannel (server_id, channel_id, is_fve) VALUES (server_id_in, channel_id_in, is_fve_char); IF recalcfamily_in > 0 THEN perform rhn_channel.update_family_counts(channel_family_id_val, server_org_id_val); END IF; perform queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; ELSE perform rhn_exception.raise_exception('channel_family_no_subscriptions'); END IF; @@ -491,7 +487,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ server_org_id_val NUMERIC; available_subscriptions NUMERIC; server_already_in_chan BOOLEAN; - update_lock numeric; channel_family_is_proxy cursor(channel_family_id_in numeric) for select 1 from rhnChannelFamily @@ -534,7 +529,6 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ END IF; if deleting_server = 0 then - insert into rhnServerHistory (id,server_id,summary,details) ( select nextval('rhn_event_id_seq'), server_id_in, @@ -543,20 +537,16 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ from rhnChannel c where c.id = channel_id_in ); - - select min(1) - into update_lock - from rhnServerNeededCache - where server_id = server_id_in - for update; - - UPDATE rhnServer SET channels_changed = current_timestamp WHERE id = server_id_in; end if; DELETE FROM rhnServerChannel WHERE server_id = server_id_in AND channel_id = channel_id_in; if deleting_server = 0 then perform queue_server(server_id_in, immediate_in); + + update rhnServer + set channels_changed = current_timestamp + where id = server_id_in; end if; channel_family_id_val := rhn_channel.family_for_channel(channel_id_in); commit fc2206ef6af0ab07b369e241bf71df7c3044d214 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Feb 18 13:57:13 2014 +0100 don't add & twice to the parameters of the url addressing following line: WARNING: Parameters: Invalid chunk '' ignored. line 189: params.append("&"); line 204: if (params.length() > 1) { params.append("&"); params weren't empty so another & was added diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java index 7eee746..2489341 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java @@ -186,7 +186,7 @@ public class ListTagUtil { params.append("?"); } else if (url.indexOf('?') != url.length() - 1) { - params.append("&"); + url += "&"; } for (Enumeration<String> en = request.getParameterNames(); en.hasMoreElements();) { commit 63a5b26f9b5cbdc41fa8e05aedf82185f90e957a Author: Jan Dobes <jdobes(a)redhat.com> Date: Tue Feb 18 13:06:34 2014 +0100 do not use fixed size to display whole number in pagination lists, in certain browsers were displayed just 2 digits diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index dc3edfa..1eaa230 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -292,7 +292,6 @@ header { .display-number{ .input-sm; display: inline-block; - width: 5em; border: 1px solid #dddddd; } .view-systems-registered{ commit e639b6c439651782851707bddaf7e535f58f79d1 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Feb 18 11:18:36 2014 +0100 add space after alphabar result sign diff --git a/branding/css/spacewalk-tables.less b/branding/css/spacewalk-tables.less index 68359fd..71744e9 100644 --- a/branding/css/spacewalk-tables.less +++ b/branding/css/spacewalk-tables.less @@ -92,7 +92,7 @@ tfoot{ } tr.alphaResult td.sortedCol:before { - content: "\f054"; + content: "\f054\a0"; font-family: 'FontAwesome'; } commit 1bb9bcc6e1ddcf06a3a861c7f2f9373f22cf5b01 Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Feb 17 17:05:06 2014 +0100 Automatic commit of package [spacewalk-java] release [2.1.154-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index e266545..f2f724a 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.153 +Version: 2.1.154 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -801,6 +801,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Mon Feb 17 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.154-1 +- 1064573 - make sidenav html valid + * Mon Feb 17 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.153-1 - Remove unused context store - Use .toHashCode diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 93d5511..7cd8d7d 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.153-1 java/ +2.1.154-1 java/ commit ba9ada7db0f9a08aec1e4a942bb262a195b231c5 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Feb 17 16:32:34 2014 +0100 Automatic commit of package [spacewalk-branding] release [2.1.31-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 5b86b5d..726de2a 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -9,7 +9,7 @@ %endif Name: spacewalk-branding -Version: 2.1.30 +Version: 2.1.31 Release: 1%{?dist} Summary: Spacewalk branding data @@ -89,6 +89,9 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Mon Feb 17 2014 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.31-1 +- 1064573 - sidenav css should respect valid html constructions + * Sat Feb 15 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.30-1 - Use jquery-timepicker-1.3.3 diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index 8708033..4ad39b7 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -2.1.30-1 branding/ +2.1.31-1 branding/ commit f3dbd0d5cbe1d8939cb7a2ee871383de94238f81 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Mon Feb 17 16:13:11 2014 +0100 1064573 - sidenav css should respect valid html constructions diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index 2ee0f6f..dc3edfa 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -381,23 +381,23 @@ aside .nav > li > a { /* ul-submenues */ /* first submenu */ - ul>ul li { + ul > li ul li { padding: 0 0 0 1em !important; margin: 0; background: @spacewalk-list-first-submenu; border-bottom: 1px solid #ccc; } - ul>ul li.active, - ul>ul li.active:hover, - ul>ul li.active a, - ul>ul li.active a:hover { + ul > li ul li.active, + ul > li ul li.active:hover, + ul > li ul li.active a, + ul > li ul li.active a:hover { background: @spacewalk-list-first-submenu-active; .glow-text-deleted; } - ul>ul li:hover, ul>ul li a:hover { + ul > li ul li:hover, ul > li ul li a:hover { background: @spacewalk-list-first-submenu-hover; } - ul>ul li:last-child { + ul > li ul li:last-child { border-bottom: 1px solid @spacewalk-list-first-submenu-last-line; } /* second submenu */ commit 3c15a2224365758e215497100ed54ae7eb4d1944 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Thu Feb 13 14:31:16 2014 +0100 1064573 - make sidenav html valid constructs like: <ul> <li>..</li> <ul> <li>..</li> </ul> </ul> are not html valid, replacing them with valid ones like: <ul> <li>..</li> <li><ul> <li>..</li> </ul></li> </ul> hint: nested <ul>s should be inside <li> diff --git a/java/code/src/com/redhat/rhn/frontend/nav/SidenavRenderer.java b/java/code/src/com/redhat/rhn/frontend/nav/SidenavRenderer.java index 625d8a3..6d56191 100644 --- a/java/code/src/com/redhat/rhn/frontend/nav/SidenavRenderer.java +++ b/java/code/src/com/redhat/rhn/frontend/nav/SidenavRenderer.java @@ -45,6 +45,10 @@ public class SidenavRenderer extends Renderable { if (!canRender(null, depth)) { return; } + if (depth > 1) { + HtmlTag li = new HtmlTag("li"); + sb.append(li.renderOpenTag() + '\n'); + } HtmlTag ul = new HtmlTag("ul"); ul.setAttribute("class", "nav nav-pills nav-stacked"); @@ -104,6 +108,11 @@ public class SidenavRenderer extends Renderable { HtmlTag ul = new HtmlTag("ul"); sb.append(ul.renderCloseTag() + "\n"); + + if (depth > 1) { + HtmlTag li = new HtmlTag("li"); + sb.append(li.renderCloseTag() + '\n'); + } } /** {@inheritDoc} */ commit 0921851e82e34f5da3d460b1a3c0b935339f9586 Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Feb 17 14:59:49 2014 +0100 Automatic commit of package [spacewalk-web] release [2.1.58-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 5d44b3d..fe0d2ae 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.57-1 web/ +2.1.58-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 38e6364..b3e618a 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.57 +Version: 2.1.58 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -269,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Mon Feb 17 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.58-1 +- Refeactored cookie parsing code to better handle malformed cookies + * Fri Feb 14 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.57-1 - make the time format also localized - Introduce a date-time picker. commit 087c47ca41b2203e2bf0a6df967b869ac86b940b Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Feb 17 14:50:35 2014 +0100 Automatic commit of package [spacewalk-java] release [2.1.153-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 9ef11a3..e266545 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.152 +Version: 2.1.153 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -801,6 +801,19 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Mon Feb 17 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.153-1 +- Remove unused context store +- Use .toHashCode +- removing unnecessary overriding attribute +- removing unnecessary overriding attribute +- removing unnecessary overriding attribute +- removing unnecessary overriding attribute +- removing unnecessary overriding attribute +- remove unnecessary cast +- remove unnecessary cast +- remove unnecessary else statement +- remove unnecessary else statement + * Fri Feb 14 2014 Stephen Herr <sherr(a)redhat.com> 2.1.152-1 - 1065483 - SSM package upgrades should not install packages if not an upgrade - Proper TB3 column class diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index bc7e20d..93d5511 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.152-1 java/ +2.1.153-1 java/ commit df588f286aae3ab6ccba0f70e46e4086bf2a7883 Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Feb 17 14:21:49 2014 +0100 Remove unused context store diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ExtAuthRoleMappingAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/ExtAuthRoleMappingAction.java index 9f61a7a..6e2bcd4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ExtAuthRoleMappingAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/ExtAuthRoleMappingAction.java @@ -43,7 +43,6 @@ public class ExtAuthRoleMappingAction extends RhnAction implements Listable { public ActionForward execute(ActionMapping mapping, ActionForm formIn, HttpServletRequest request, HttpServletResponse response) { DynaActionForm daForm = (DynaActionForm) formIn; - RequestContext ctx = new RequestContext(request); ListSessionSetHelper helper = new ListSessionSetHelper(this, request); helper.execute(); commit 62c0c3cd156c856b45d4305b5154bfa7d30ee585 Author: Matej Kollar <mkollar(a)redhat.com> Date: Mon Feb 17 14:11:55 2014 +0100 Use .toHashCode using .hashCode returns hash code of builder, not of object... diff --git a/java/code/src/com/redhat/rhn/domain/user/UserServerPreferenceId.java b/java/code/src/com/redhat/rhn/domain/user/UserServerPreferenceId.java index 0f124af..cadc37c 100644 --- a/java/code/src/com/redhat/rhn/domain/user/UserServerPreferenceId.java +++ b/java/code/src/com/redhat/rhn/domain/user/UserServerPreferenceId.java @@ -105,7 +105,7 @@ public class UserServerPreferenceId implements Serializable { return new HashCodeBuilder().append(server) .append(user) .append(name) - .hashCode(); + .toHashCode(); } commit fd2f2a89524265bc570b2d7e9712effb8fbe9db7 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Mon Feb 17 14:26:06 2014 +0100 Automatic commit of package [spacewalk-schema] release [2.1.46-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 2c798ba..24217df 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -2.1.45-1 schema/spacewalk/ +2.1.46-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index affed7b..83986ab 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -4,7 +4,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 2.1.45 +Version: 2.1.46 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Mon Feb 17 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.46-1 +- 1063821 - fix ORA-01422 error when removing a channel + * Fri Feb 14 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.45-1 - fix ORA-01403: no data found, when unsubscribing a system commit 10d98ef86325811bb9e51e17be24ce2bfbb22092 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Mon Feb 17 14:18:35 2014 +0100 1063821 - fix ORA-01422 error when removing a channel diff --git a/schema/spacewalk/oracle/packages/rhn_channel.pkb b/schema/spacewalk/oracle/packages/rhn_channel.pkb index 4496361..c0f5482 100644 --- a/schema/spacewalk/oracle/packages/rhn_channel.pkb +++ b/schema/spacewalk/oracle/packages/rhn_channel.pkb @@ -157,7 +157,7 @@ IS ); begin - select 1 + select min(1) into update_lock from rhnServerNeededCache where server_id = server_id_in @@ -527,7 +527,7 @@ IS ); begin - select 1 + select min(1) into update_lock from rhnServerNeededCache where server_id = server_id_in diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb b/schema/spacewalk/postgres/packages/rhn_channel.pkb index 98360b9..02c998b 100644 --- a/schema/spacewalk/postgres/packages/rhn_channel.pkb +++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 49755627c92e9950ba24fd313705bb282acdcfba +-- oracle equivalent source sha1 5abe0e2ce13d05c06619611ef8e25e443de89d1d -- -- Copyright (c) 2008--2013 Red Hat, Inc. -- @@ -149,7 +149,7 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ where c.id = channel_id_in ); - select 1 + select min(1) into update_lock from rhnServerNeededCache where server_id = server_id_in @@ -544,7 +544,7 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ where c.id = channel_id_in ); - select 1 + select min(1) into update_lock from rhnServerNeededCache where server_id = server_id_in diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.oracle index 3dab16b..80f5511 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.oracle +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.oracle @@ -157,7 +157,7 @@ IS ); begin - select 1 + select min(1) into update_lock from rhnServerNeededCache where server_id = server_id_in @@ -527,7 +527,7 @@ IS ); begin - select 1 + select min(1) into update_lock from rhnServerNeededCache where server_id = server_id_in diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.postgresql index 0c3c9b1..7baba7b 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.postgresql +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/048-rhn_channel.pkb.sql.postgresql @@ -1,4 +1,4 @@ --- oracle equivalent source sha1 c11143025f1ed0730af16785aee42198b8e477c7 +-- oracle equivalent source sha1 c32b134834133c1642e86f58782416d79004b52b -- -- Copyright (c) 2008--2013 Red Hat, Inc. -- @@ -149,7 +149,7 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ where c.id = channel_id_in ); - select 1 + select min(1) into update_lock from rhnServerNeededCache where server_id = server_id_in @@ -544,7 +544,7 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_ where c.id = channel_id_in ); - select 1 + select min(1) into update_lock from rhnServerNeededCache where server_id = server_id_in commit 0dbd357bf955eb05ea5853f05096342f696d8dc8 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Feb 17 11:52:02 2014 +0100 removing unnecessary overriding attribute that just hides a usable field from the upper class diff --git a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java index ea9cf61..c3d947f 100644 --- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java +++ b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java @@ -32,7 +32,6 @@ public class ConfigChannelTag extends TagSupport { /** * <cfg:channel id="" value="" type="" size="large|small" nolink=""> */ - private String id; private String name; private String type; private boolean nolink; commit 996d3c21745b37c59cc7d985f5c927beba522e36 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Feb 17 11:51:51 2014 +0100 removing unnecessary overriding attribute that just hides a usable field from the upper class diff --git a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java index 7cc95dc..6788d01 100644 --- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java +++ b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java @@ -44,7 +44,6 @@ public class ConfigFileTag extends TagSupport { /** * <cfg:file id="" value="" type="file|dir" revision="" nolink=""> */ - private String id; private String path; private String type; private boolean nolink; commit c3146da805d28962af13d16ee5370480515f7043 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Feb 17 11:51:38 2014 +0100 removing unnecessary overriding attribute that just hides a usable field from the upper class diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelLabelException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelLabelException.java index a4231ec..c5c2033 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelLabelException.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelLabelException.java @@ -27,11 +27,6 @@ import com.redhat.rhn.FaultException; public class InvalidChannelLabelException extends FaultException { /** - * Label the user attempted to give the channel. - */ - private String label; - - /** * Indicates why the channel label is invalid. */ private Reason reason; commit 06cf2658b02d5bcb96bb68fa826f280bea9c3cf9 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Feb 17 11:51:30 2014 +0100 removing unnecessary overriding attribute that just hides a usable field from the upper class diff --git a/java/code/src/com/redhat/rhn/manager/common/BaseFileListEditCommand.java b/java/code/src/com/redhat/rhn/manager/common/BaseFileListEditCommand.java index 0d028ee..ab4641c 100644 --- a/java/code/src/com/redhat/rhn/manager/common/BaseFileListEditCommand.java +++ b/java/code/src/com/redhat/rhn/manager/common/BaseFileListEditCommand.java @@ -30,7 +30,6 @@ import java.util.Iterator; */ public abstract class BaseFileListEditCommand extends BasePersistOperation { - protected User user; protected FileList list; protected String newLabel; commit 1de9b9275b812dd02c9f57e9e0317852e50d8e46 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Feb 17 11:51:14 2014 +0100 removing unnecessary overriding attribute that just hides a usable field from the upper class diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java index 2b82842..2836424 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java @@ -123,7 +123,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation { public static final String PACKAGE_TO_REMOVE = "rhn-kickstart-virtualization"; - private User user; private KickstartData ksdata; protected String cobblerProfileLabel; protected boolean cobblerOnly; commit abc29f6a99b6c5978edddf1904972025e45067de Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Feb 17 11:36:48 2014 +0100 remove unnecessary cast 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 889fe87..ad08458 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 @@ -175,7 +175,7 @@ public class ErrataSearchAction extends BaseSearchAction { } Map m = form.getMap(); - Set<String> keys = (Set<String>)m.keySet(); + Set<String> keys = m.keySet(); for (String key : keys) { Object vObj = m.get(key); request.setAttribute(key, vObj); commit 6e744ac56312fdb129bbefa8ee65cb1dceee57ea Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Feb 17 11:36:41 2014 +0100 remove unnecessary cast diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java index 6f669eb..bce9440 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java @@ -155,7 +155,7 @@ public class XccdfSearchAction extends BaseSearchAction { setupRuleResultLabelOptions(request); setupShowAsOption(form); Map m = form.getMap(); - Set<String> keys = (Set<String>)m.keySet(); + Set<String> keys = m.keySet(); for (String key : keys) { Object vObj = m.get(key); request.setAttribute(key, vObj); commit 27f2b95091d3fd45399d0525dea7fe979b4e27d6 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Feb 17 11:30:40 2014 +0100 remove unnecessary else statement 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 aa9bd37..df1457f 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 @@ -82,9 +82,7 @@ public class DocSearchSetupAction extends BaseSearchAction { if (isSubmitted(form)) { return mapping.findForward("success"); } - else { - return mapping.findForward(RhnHelper.DEFAULT_FORWARD); - } + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); } private List performSearch(Long sessionId, String searchString, commit 97f5359ffd9f38ee8c503fbfef9daead3a44c923 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Feb 17 11:30:22 2014 +0100 remove unnecessary else statement diff --git a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java index 5850dc3..6f669eb 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/audit/scap/XccdfSearchAction.java @@ -96,10 +96,8 @@ public class XccdfSearchAction extends BaseSearchAction { if (dateSrch instanceof Boolean) { return ((Boolean)dateSrch).booleanValue(); } - else { - String strDateSearch = (String)request.getAttribute(SCAN_DATE_SEARCH); - return "on".equals(strDateSearch); - } + String strDateSearch = (String)request.getAttribute(SCAN_DATE_SEARCH); + return "on".equals(strDateSearch); } private DateRangePicker setupDatePicker(DynaActionForm form, commit 7cf5dd43dc4b4dc88a47ee5e4f8bb24349a9ae2f Author: Matej Kollar <mkollar(a)redhat.com> Date: Sat Feb 15 16:31:43 2014 +0100 Automatic commit of package [spacewalk-branding] release [2.1.30-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 87faf93..5b86b5d 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -9,7 +9,7 @@ %endif Name: spacewalk-branding -Version: 2.1.29 +Version: 2.1.30 Release: 1%{?dist} Summary: Spacewalk branding data @@ -89,6 +89,9 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Sat Feb 15 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.30-1 +- Use jquery-timepicker-1.3.3 + * Fri Feb 14 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.29-1 - datepicker needs bootstrap-datepicker and jquery-timepicker diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index 55a849c..8708033 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -2.1.29-1 branding/ +2.1.30-1 branding/ commit 59b1bd3c4b254d387e77c09911d0c5df24012930 Author: Matej Kollar <mkollar(a)redhat.com> Date: Sat Feb 15 16:27:28 2014 +0100 Use jquery-timepicker-1.3.3 diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 71b5d38..87faf93 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -27,7 +27,7 @@ Requires: httpd Requires: bootstrap <= 3.0.0 Requires: bootstrap-datepicker Requires: font-awesome >= 4.0.0 -Requires: jquery-timepicker <= 1.3.2 +Requires: jquery-timepicker <= 1.3.3 Requires: roboto >= 1.2 Requires: pwstrength-bootstrap commit 54987204e6c3b9b5a6574cd23ba13d797e9f944e Author: Stephen Herr <sherr(a)redhat.com> Date: Fri Feb 14 13:45:30 2014 -0500 Automatic commit of package [spacewalk-java] release [2.1.152-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index cdfeb51..9ef11a3 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.151 +Version: 2.1.152 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -801,6 +801,10 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Fri Feb 14 2014 Stephen Herr <sherr(a)redhat.com> 2.1.152-1 +- 1065483 - SSM package upgrades should not install packages if not an upgrade +- Proper TB3 column class + * Fri Feb 14 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.151-1 - fixed errors in date/time format conversions - Introduce a date-time picker. diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 8875cee..bc7e20d 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.151-1 java/ +2.1.152-1 java/ commit bc4d195bb51950c1bd14bf48df5d68fbad740d3d Author: Stephen Herr <sherr(a)redhat.com> Date: Fri Feb 14 13:45:01 2014 -0500 1065483 - SSM package upgrades should not install packages if not an upgrade diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java index 36cbde5..5620c22 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java @@ -48,14 +48,8 @@ public class SsmUpgradePackagesAction extends SsmPackagesAction { SsmUpgradePackagesEvent supe = (SsmUpgradePackagesEvent) event; Map<Long, List<Map<String, Long>>> packageListItems = supe.getSysPackageSet(); - List<Map<String, Long>> pkgs = new ArrayList<Map<String, Long>>(); - for (List<Map<String, Long>> pkgList : packageListItems.values()) { - for (Map<String, Long> pkg : pkgList) { - pkgs.add(pkg); - } - } - - return ActionManager.schedulePackageInstall(user, sids, pkgs, earliest); + + return ActionManager.schedulePackageUpgrades(user, packageListItems, earliest); } commit db7036773b4c977115650f85df1afeb7fe7539d3 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 17:02:18 2014 +0100 Automatic commit of package [spacewalk-branding] release [2.1.29-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 966289b..71b5d38 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -9,7 +9,7 @@ %endif Name: spacewalk-branding -Version: 2.1.28 +Version: 2.1.29 Release: 1%{?dist} Summary: Spacewalk branding data @@ -89,6 +89,9 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Fri Feb 14 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.29-1 +- datepicker needs bootstrap-datepicker and jquery-timepicker + * Fri Feb 14 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.28-1 - simplify datepicker layout and unify look of date/time part - Introduce a date-time picker. diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index de5879b..55a849c 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -2.1.28-1 branding/ +2.1.29-1 branding/ commit 3b59d7883e1e6988c2690f2d87313c6b0a3abdd4 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 17:02:06 2014 +0100 Automatic commit of package [bootstrap-datepicker] minor release [1.3.0-2]. diff --git a/rel-eng/packages/bootstrap-datepicker b/rel-eng/packages/bootstrap-datepicker index c620ef0..aeae907 100644 --- a/rel-eng/packages/bootstrap-datepicker +++ b/rel-eng/packages/bootstrap-datepicker @@ -1 +1 @@ -1.3.0-1 spec-tree/bootstrap-datepicker/ +1.3.0-2 spec-tree/bootstrap-datepicker/ diff --git a/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec b/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec index 9f7b1e0..672c1a0 100644 --- a/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec +++ b/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec @@ -1,6 +1,6 @@ Name: bootstrap-datepicker Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bootstrap-datepicker provides a flexible datepicker widget in the Twitter bootstrap style. Group: Applications/Internet @@ -39,6 +39,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 14 2014 Michael Mraka <michael.mraka(a)redhat.com> 1.3.0-2 +- added missing directory + * Fri Feb 14 2014 Michael Mraka <michael.mraka(a)redhat.com> 1.3.0-1 - initial build of bootstrap-datepicker commit d20edf513c88ac9b579bb03b62e681d352ed00c3 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 17:01:25 2014 +0100 added missing directory diff --git a/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec b/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec index d4b4a95..9f7b1e0 100644 --- a/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec +++ b/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec @@ -22,6 +22,7 @@ style. %install rm -rf %{buildroot} +install -d -m 755 %{buildroot}%{_var}/www/html/css install -d -m 755 %{buildroot}%{_var}/www/html/javascript install -m 644 js/bootstrap-datepicker.js %{buildroot}%{_var}/www/html/javascript/ install -m 644 css/datepicker3.css %{buildroot}%{_var}/www/html/css/bootstrap-datepicker.css commit 172e62b5f5169fca0340d0ac87a4cfc1248ad020 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 16:46:48 2014 +0100 fixed indentation diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index a73d9c7..966289b 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -23,13 +23,13 @@ BuildArch: noarch BuildRequires: java-devel >= 1.5.0 BuildRequires: nodejs-less BuildRequires: bootstrap-less <= 3.0.0 -Requires: httpd -Requires: bootstrap <= 3.0.0 -Requires: bootstrap-datepicker -Requires: font-awesome >= 4.0.0 -Requires: jquery-timepicker <= 1.3.2 -Requires: roboto >= 1.2 -Requires: pwstrength-bootstrap +Requires: httpd +Requires: bootstrap <= 3.0.0 +Requires: bootstrap-datepicker +Requires: font-awesome >= 4.0.0 +Requires: jquery-timepicker <= 1.3.2 +Requires: roboto >= 1.2 +Requires: pwstrength-bootstrap %description Spacewalk specific branding, CSS, and images. commit f42de562490c3773d79a02337ba434cc3fe6225e Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 16:45:17 2014 +0100 datepicker needs bootstrap-datepicker and jquery-timepicker diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index e8e8202..a73d9c7 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -25,7 +25,9 @@ BuildRequires: nodejs-less BuildRequires: bootstrap-less <= 3.0.0 Requires: httpd Requires: bootstrap <= 3.0.0 +Requires: bootstrap-datepicker Requires: font-awesome >= 4.0.0 +Requires: jquery-timepicker <= 1.3.2 Requires: roboto >= 1.2 Requires: pwstrength-bootstrap commit 47fc382362579cc0bdab05e313d0c14e9a4a01f7 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 16:41:52 2014 +0100 add bootstrap-datepicker and jquery-timepicker to yum repos diff --git a/rel-eng/comps/comps-spacewalk-server-fedora18.xml b/rel-eng/comps/comps-spacewalk-server-fedora18.xml index 1579c14..cb54127 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora18.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora18.xml @@ -20,6 +20,7 @@ <packagereq type="default">yum-rhn-plugin</packagereq> <packagereq type="default">bootstrap</packagereq> + <packagereq type="default">bootstrap-datepicker</packagereq> <packagereq type="optional">bootstrap-less</packagereq> <packagereq type="default">cobbler2</packagereq> <packagereq type="default">cobbler20</packagereq> @@ -32,6 +33,7 @@ <packagereq type="optional">font-awesome-devel</packagereq> <packagereq type="optional">heirloom-pkgtools</packagereq> <packagereq type="default">jpam</packagereq> + <packagereq type="default">jquery-timepicker</packagereq> <packagereq type="default">MessageQueue</packagereq> <packagereq type="default">nocpulse-common</packagereq> <packagereq type="default">nocpulse-db-perl</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-fedora19.xml b/rel-eng/comps/comps-spacewalk-server-fedora19.xml index 1be8f3a..e2b5e05 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora19.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora19.xml @@ -20,6 +20,7 @@ <packagereq type="default">yum-rhn-plugin</packagereq> <packagereq type="default">bootstrap</packagereq> + <packagereq type="default">bootstrap-datepicker</packagereq> <packagereq type="optional">bootstrap-less</packagereq> <packagereq type="default">cobbler2</packagereq> <packagereq type="default">cobbler20</packagereq> @@ -32,6 +33,7 @@ <packagereq type="optional">font-awesome-devel</packagereq> <packagereq type="optional">heirloom-pkgtools</packagereq> <packagereq type="default">jpam</packagereq> + <packagereq type="default">jquery-timepicker</packagereq> <packagereq type="default">MessageQueue</packagereq> <packagereq type="default">nocpulse-common</packagereq> <packagereq type="default">nocpulse-db-perl</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-fedora20.xml b/rel-eng/comps/comps-spacewalk-server-fedora20.xml index 1be8f3a..e2b5e05 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora20.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora20.xml @@ -20,6 +20,7 @@ <packagereq type="default">yum-rhn-plugin</packagereq> <packagereq type="default">bootstrap</packagereq> + <packagereq type="default">bootstrap-datepicker</packagereq> <packagereq type="optional">bootstrap-less</packagereq> <packagereq type="default">cobbler2</packagereq> <packagereq type="default">cobbler20</packagereq> @@ -32,6 +33,7 @@ <packagereq type="optional">font-awesome-devel</packagereq> <packagereq type="optional">heirloom-pkgtools</packagereq> <packagereq type="default">jpam</packagereq> + <packagereq type="default">jquery-timepicker</packagereq> <packagereq type="default">MessageQueue</packagereq> <packagereq type="default">nocpulse-common</packagereq> <packagereq type="default">nocpulse-db-perl</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml index 90f25ea..fdfcbf5 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml @@ -23,6 +23,7 @@ <packagereq type="default">bea-stax</packagereq> <packagereq type="default">bea-stax-api</packagereq> <packagereq type="default">bootstrap</packagereq> + <packagereq type="default">bootstrap-datepicker</packagereq> <packagereq type="optional">bootstrap-less</packagereq> <packagereq type="default">c3p0</packagereq> <packagereq type="default">cglib</packagereq> @@ -57,6 +58,7 @@ <packagereq type="default">jaxen-manual</packagereq> <packagereq type="default">jaxen-repolib</packagereq> <packagereq type="default">jpam</packagereq> + <packagereq type="default">jquery-timepicker</packagereq> <packagereq type="default">MessageQueue</packagereq> <packagereq type="default">msv</packagereq> <packagereq type="default">msv-demo</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml index caef27f..9e8607a 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml @@ -20,6 +20,7 @@ <packagereq type="default">yum-rhn-plugin</packagereq> <packagereq type="default">bootstrap</packagereq> + <packagereq type="default">bootstrap-datepicker</packagereq> <packagereq type="optional">bootstrap-less</packagereq> <packagereq type="default">cobbler2</packagereq> <packagereq type="default">cobbler20</packagereq> @@ -32,6 +33,7 @@ <packagereq type="optional">font-awesome-devel</packagereq> <packagereq type="optional">heirloom-pkgtools</packagereq> <packagereq type="default">jpam</packagereq> + <packagereq type="default">jquery-timepicker</packagereq> <packagereq type="default">MessageQueue</packagereq> <packagereq type="default">nocpulse-common</packagereq> <packagereq type="default">nocpulse-db-perl</packagereq> commit 61b77af6e47b19f11ec2ddc9a9453025a42d5fab Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 16:37:46 2014 +0100 Automatic commit of package [jquery-timepicker] minor release [1.3.3-1]. diff --git a/rel-eng/packages/jquery-timepicker b/rel-eng/packages/jquery-timepicker new file mode 100644 index 0000000..86c4166 --- /dev/null +++ b/rel-eng/packages/jquery-timepicker @@ -0,0 +1 @@ +1.3.3-1 spec-tree/jquery-timepicker/ diff --git a/spec-tree/jquery-timepicker/jquery-timepicker.spec b/spec-tree/jquery-timepicker/jquery-timepicker.spec index bb29318..41fd940 100644 --- a/spec-tree/jquery-timepicker/jquery-timepicker.spec +++ b/spec-tree/jquery-timepicker/jquery-timepicker.spec @@ -1,6 +1,6 @@ Name: jquery-timepicker Version: 1.3.3 -Release: 0%{?dist} +Release: 1%{?dist} Summary: A lightweight, customizable jQuery timepicker plugin inspired by Google Calendar. Group: Applications/Internet @@ -38,3 +38,6 @@ rm -rf %{buildroot} %changelog +* Fri Feb 14 2014 Michael Mraka <michael.mraka(a)redhat.com> 1.3.3-1 +- initial build of jquery-timepicker + commit 039f30eac4d07314c49a3db1d9603e8cda14f59a Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 16:36:17 2014 +0100 jquery-timepicker packaging diff --git a/spec-tree/jquery-timepicker/jquery-timepicker.spec b/spec-tree/jquery-timepicker/jquery-timepicker.spec new file mode 100644 index 0000000..bb29318 --- /dev/null +++ b/spec-tree/jquery-timepicker/jquery-timepicker.spec @@ -0,0 +1,40 @@ +Name: jquery-timepicker +Version: 1.3.3 +Release: 0%{?dist} +Summary: A lightweight, customizable jQuery timepicker plugin inspired by Google Calendar. + +Group: Applications/Internet +License: Apache Software License v2 +URL: http://jonthornton.github.io/jquery-timepicker/ +Source0: https://github.com/jonthornton/jquery-timepicker/archive/%{version}.tar.g... +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildArch: noarch + +%description +A lightweight, customizable jQuery timepicker plugin inspired by Google Calendar. + + +%prep +%setup -q + +%build + +%install +rm -rf %{buildroot} +install -d -m 755 %{buildroot}%{_var}/www/html/css +install -d -m 755 %{buildroot}%{_var}/www/html/javascript +install -m 644 jquery.timepicker.css %{buildroot}%{_var}/www/html/css/ +install -m 644 jquery.timepicker.js %{buildroot}%{_var}/www/html/javascript/ + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%{_var}/www/html/css/* +%{_var}/www/html/javascript/* + + + +%changelog diff --git a/spec-tree/jquery-timepicker/tito.props b/spec-tree/jquery-timepicker/tito.props new file mode 100644 index 0000000..8c63ded --- /dev/null +++ b/spec-tree/jquery-timepicker/tito.props @@ -0,0 +1,3 @@ +[buildconfig] +tagger = tito.tagger.ReleaseTagger +builder = spacewalkx.builderx.NoTgzBuilder commit 22b46647fd50dae50418b7d41a3d5833e6c4d588 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Feb 14 16:31:13 2014 +0100 Automatic commit of package [rhn-client-tools] release [2.1.16-1]. diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index 5758523..5f0215c 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools -Version: 2.1.15 +Version: 2.1.16 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -360,6 +360,10 @@ make -f Makefile.rhn-client-tools test %endif %changelog +* Fri Feb 14 2014 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.16-1 +- 1061013 - remove up2date_config.rpmmacros client action +- 1061013 - remove macros.up2date from package build + * Fri Feb 14 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.15-1 - 1061013 - remove unneeded rpm macros file - 1060742 - new information icon in gnome3 diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools index a3d6175..14ef5ce 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -2.1.15-1 client/rhel/rhn-client-tools/ +2.1.16-1 client/rhel/rhn-client-tools/ commit 46225ac557ead3dfac019958020861fe740aea66 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Feb 14 16:23:52 2014 +0100 1061013 - remove up2date_config.rpmmacros client action Support for this client-side action has never been implemented on the server. diff --git a/client/rhel/rhn-client-tools/src/actions/up2date_config.py b/client/rhel/rhn-client-tools/src/actions/up2date_config.py index 0edd125..44f31dd 100644 --- a/client/rhel/rhn-client-tools/src/actions/up2date_config.py +++ b/client/rhel/rhn-client-tools/src/actions/up2date_config.py @@ -16,7 +16,6 @@ cfg = config.initUp2dateConfig() __rhnexport__ = [ 'update', - 'rpmmacros', 'get'] argVerbose = 0 @@ -63,49 +62,6 @@ def get(cache_only=None): return (0, "configuration retrived", {'data' : ret}) -def rpmmacros(macroName, macroValue, cache_only): - if cache_only: - return (0, "no-ops for caching", {}) - writeUp2dateMacro(macroName, macroValue) - return (0, "%s set to %s" % (macroName, macroValue), {}) - - -def writeUp2dateMacro(macroName, macroValue): - - if os.access("/etc/rpm/macros.up2date", os.R_OK): - f = open("/etc/rpm/macros.up2date", "r") - lines = f.readlines() - f.close() - else: - lines = [] - comment_r = re.compile("\s*#.*") - value_r = re.compile("%s.*" % macroName) - blank_r = re.compile("\s*") - newfile = [] - for line in lines: - m = value_r.match(line) - if m: - continue - - m = comment_r.match(line) - if m: - newfile.append(line) - continue - - newfile.append(line) - - # dont care about blank lines... - - newfile.append("\n") - newfile.append("%s %s" % (macroName, macroValue)) - - - f = open("/etc/rpm/macros.up2date", "w") - for line in newfile: - f.write(line) - f.write("\n") - f.close() - def main(): configdatatup = get() commit 2c2b59ebbac688791015bfbf0d1b265365d6a8f5 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Feb 14 16:20:13 2014 +0100 1061013 - remove macros.up2date from package build diff --git a/client/rhel/rhn-client-tools/etc-conf/Makefile b/client/rhel/rhn-client-tools/etc-conf/Makefile index 9054968..c418d2a 100644 --- a/client/rhel/rhn-client-tools/etc-conf/Makefile +++ b/client/rhel/rhn-client-tools/etc-conf/Makefile @@ -4,7 +4,6 @@ PREFIX ?= CONFIG = up2date.config -MACROS_CONFIG = macros.up2date # Directories for installation PAMD_DIR = $(PREFIX)/etc/pam.d @@ -41,9 +40,6 @@ install:: all $(DIRS) [ -f $(CONFIG_DIR)/up2date ] && true || \ $(INSTALL_DATA) $(CONFIG) $(CONFIG_DIR)/up2date - [ -f $(MACROS_DIR)/macros.up2date ] && true || \ - $(INSTALL_DATA) $(MACROS_CONFIG) $(MACROS_DIR)/macros.up2date - $(INSTALL_DATA) up2date.logrotate $(LOGROTATE_DIR)/up2date clean:: commit eaa062ba01b3b919fbebf29c51b0e3e3c18807b4 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 16:02:14 2014 +0100 Automatic commit of package [bootstrap-datepicker] minor release [1.3.0-1]. diff --git a/rel-eng/packages/bootstrap-datepicker b/rel-eng/packages/bootstrap-datepicker new file mode 100644 index 0000000..c620ef0 --- /dev/null +++ b/rel-eng/packages/bootstrap-datepicker @@ -0,0 +1 @@ +1.3.0-1 spec-tree/bootstrap-datepicker/ diff --git a/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec b/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec index a6a4c92..d4b4a95 100644 --- a/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec +++ b/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec @@ -1,6 +1,6 @@ Name: bootstrap-datepicker Version: 1.3.0 -Release: 0%{?dist} +Release: 1%{?dist} Summary: Bootstrap-datepicker provides a flexible datepicker widget in the Twitter bootstrap style. Group: Applications/Internet @@ -38,3 +38,6 @@ rm -rf %{buildroot} %changelog +* Fri Feb 14 2014 Michael Mraka <michael.mraka(a)redhat.com> 1.3.0-1 +- initial build of bootstrap-datepicker + commit be87fa6f071cfb4546107dacaf4de74429ffa472 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Feb 14 15:58:05 2014 +0100 bootstrap-datepicker packaging diff --git a/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec b/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec new file mode 100644 index 0000000..a6a4c92 --- /dev/null +++ b/spec-tree/bootstrap-datepicker/bootstrap-datepicker.spec @@ -0,0 +1,40 @@ +Name: bootstrap-datepicker +Version: 1.3.0 +Release: 0%{?dist} +Summary: Bootstrap-datepicker provides a flexible datepicker widget in the Twitter bootstrap style. + +Group: Applications/Internet +License: Apache Software License v2 +URL: https://github.com/eternicode/bootstrap-datepicker/ +Source0: https://github.com/eternicode/bootstrap-datepicker/archive/%{version}.tar... +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildArch: noarch + +%description +Bootstrap-datepicker provides a flexible datepicker widget in the Twitter bootstrap +style. + + +%prep +%setup -q + +%build + +%install +rm -rf %{buildroot} +install -d -m 755 %{buildroot}%{_var}/www/html/javascript +install -m 644 js/bootstrap-datepicker.js %{buildroot}%{_var}/www/html/javascript/ +install -m 644 css/datepicker3.css %{buildroot}%{_var}/www/html/css/bootstrap-datepicker.css + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%{_var}/www/html/css/* +%{_var}/www/html/javascript/* + + + +%changelog diff --git a/spec-tree/bootstrap-datepicker/tito.props b/spec-tree/bootstrap-datepicker/tito.props new file mode 100644 index 0000000..8c63ded --- /dev/null +++ b/spec-tree/bootstrap-datepicker/tito.props @@ -0,0 +1,3 @@ +[buildconfig] +tagger = tito.tagger.ReleaseTagger +builder = spacewalkx.builderx.NoTgzBuilder commit 74e8a81ffd83502f77fe4168850c4762b5ca34a2 Author: Mike Dorman <mdorman(a)godaddy.com> Date: Thu Feb 13 11:41:08 2014 -0700 Refeactored cookie parsing code to better handle malformed cookies diff --git a/web/modules/pxt/PXT/ApacheHandler.pm b/web/modules/pxt/PXT/ApacheHandler.pm index 0f8f892..d4e4a8a 100644 --- a/web/modules/pxt/PXT/ApacheHandler.pm +++ b/web/modules/pxt/PXT/ApacheHandler.pm @@ -26,6 +26,8 @@ use Apache2::ServerUtil (); use Apache2::Log (); use Apache2::RequestIO (); +use APR::Request::Error; + use BSD::Resource; use Carp; use Compress::Zlib; @@ -313,7 +315,11 @@ sub initialize_pxt { $dbh->enable_profile; } - my $cookies = Apache2::Cookie->fetch; + #my $cookies = Apache2::Cookie->fetch; + my $req = APR::Request::Apache2->handle($r); + my $jar = eval {$req->jar()} || $@->jar; + my $cookies = $jar->cookie_class('Apache2::Cookie'); + my $request = new PXT::Request $r, undef, $cookies; my $apr; commit 8d9b3d2667457d7a12df075b9bb95eaf3d708867 Author: Bo Maryniuk <bo(a)suse.de> Date: Fri Feb 14 15:36:00 2014 +0100 Proper TB3 column class diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/datepicker-with-label.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/datepicker-with-label.jsp index eb70114..ee8c8d9 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/datepicker-with-label.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/datepicker-with-label.jsp @@ -1,7 +1,7 @@ <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <div class="form-group"> - <label class="col-lg-3 control-label"><bean:message key="${param.label_text}" /></label> - <div class="col-lg-4"> + <label class="col-md-3 control-label"><bean:message key="${param.label_text}" /></label> + <div class="col-md-4"> <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> <jsp:param name="widget" value="${param.widget}" /> </jsp:include> commit de1a11a8dac912997a175efa89986ff4ac842453 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Wed Feb 12 15:02:09 2014 +0100 fix spanish translation for selected systems (string does not take a parameter anymore) diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index 8f51d76..f0e01d4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -1350,7 +1350,7 @@ 5 systems selected </context> </context-group> - <target>{0} sistemas seleccionados</target> + <target>sistemas seleccionados</target> </trans-unit>  <trans-unit id="footer.jsp.copyright"> commit bdbf42d6a36586fea6448336ce4258031ecdee72 Author: Silvio Moioli <smoioli(a)suse.de> Date: Fri Feb 14 15:29:10 2014 +0100 Revert "fix spanish translation for selected systems (string does not take a parameter anymore)" This reverts commit 268ad12a92fcc26cc71ec9a1cdcffc69aac519fa. diff --git a/java/buildconf/build-taskdefs.xml b/java/buildconf/build-taskdefs.xml index 551bc59..121905f 100644 --- a/java/buildconf/build-taskdefs.xml +++ b/java/buildconf/build-taskdefs.xml @@ -1,17 +1,17 @@ <project name="build-taskdefs"> <target name="init-ivy" depends="boot-deps" unless="installbuild"> <taskdef name="ivy-retrieve" - classname="org.apache.ivy.ant.IvyRetrieve" - classpathref="bootjars" /> + classname="fr.jayasoft.ivy.ant.IvyRetrieve" + classpathref="bootjars"/> <taskdef name="ivy-configure" - classname="org.apache.ivy.ant.IvyConfigure" - classpathref="bootjars" /> + classname="fr.jayasoft.ivy.ant.IvyConfigure" + classpathref="bootjars"/> <taskdef name="ivy-resolve" - classname="org.apache.ivy.ant.IvyResolve" - classpathref="bootjars" /> + classname="fr.jayasoft.ivy.ant.IvyResolve" + classpathref="bootjars"/> <taskdef name="ivy-publish" - classname="org.apache.ivy.ant.IvyPublish" - classpathref="bootjars" /> + classname="fr.jayasoft.ivy.ant.IvyPublish" + classpathref="bootjars"/> </target> <target name="init-taskdefs" depends="link-jars,compile-internal" diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index f0e01d4..8f51d76 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml @@ -1350,7 +1350,7 @@ 5 systems selected </context> </context-group> - <target>sistemas seleccionados</target> + <target>{0} sistemas seleccionados</target> </trans-unit>  <trans-unit id="footer.jsp.copyright">

10 years, 4 months

1
0
0 / 0

java/code

by Tomáš Kašpárek

java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b4301f824a5664cf8cc7004111e077d05070602a Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Wed Feb 19 17:12:02 2014 +0100 1009396 - escaping system name for /rhn/monitoring/config/ProbeSuiteSystemsEdit.do diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp index c4f1468..7a9165c 100644 --- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probesuitesystemsedit.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %> <%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %> - +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <html> <body> @@ -28,7 +28,7 @@ hiddenvars="${requestScope.newset}" > <rhn:set value="${current.id}" /> <rhn:column header="probesuitesystems.jsp.system"> - <a href="/rhn/systems/details/probes/ProbesList.do?sid=${current.id}">${current.name}</a> + <a href="/rhn/systems/details/probes/ProbesList.do?sid=${current.id}">${fn:escapeXml(current.name)}</a> </rhn:column> </rhn:listdisplay> </rhn:list>

10 years, 4 months

1
0
0 / 0

java/code

by Tomáš Kašpárek

java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit c5bc22116c0b2bdcdd10a87656d4ba5e3c3362c7 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Wed Feb 19 16:54:35 2014 +0100 1009396 - escaping system name for /rhn/systems/ssm/provisioning/RemoteCommand.do system names in success message weren't escaped also saving some space as as adjacent lines were indented by way to many spaces diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java index a908a5e..c6d5416 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java +++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ProvisioningRemoteCommand.java @@ -24,6 +24,7 @@ import java.util.Locale; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringEscapeUtils; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -49,6 +50,7 @@ import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.system.SystemManager; + import java.util.Iterator; @@ -316,10 +318,8 @@ public class ProvisioningRemoteCommand extends RhnAction implements Listable { } return MessageFormat.format(body, - scriptType, - servers.size(), - servers.size() > 1 ? plrl : sngl, - summary); + scriptType, servers.size(), servers.size() > 1 ? plrl : sngl, + StringEscapeUtils.escapeXml(summary.toString())); }

10 years, 4 months

1
0
0 / 0

Changes to 'refs/tags/spacewalk-branding-2.1.33-1'

by mkollar

Tag 'spacewalk-branding-2.1.33-1' created by Matej Kollar <mkollar(a)redhat.com> at 2014-02-18 18:55 +0000 Tagging package [spacewalk-branding] version [2.1.33-1] in directory [branding/]. Changes since spacewalk-branding-2.1.32-1: Matej Kollar (2): The fix should have been the other way round... Automatic commit of package [spacewalk-branding] release [2.1.33-1]. --- branding/spacewalk-branding.spec | 7 +++++-- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) ---

10 years, 4 months

1
0
0 / 0

2 commits - branding/spacewalk-branding.spec rel-eng/packages

by mkollar

branding/spacewalk-branding.spec | 7 +++++-- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) New commits: commit a2087866cfd1d36d8927c5709ae8e748264e01a8 Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 19:55:51 2014 +0100 Automatic commit of package [spacewalk-branding] release [2.1.33-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index f58ecb3..757f6e0 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -9,7 +9,7 @@ %endif Name: spacewalk-branding -Version: 2.1.32 +Version: 2.1.33 Release: 1%{?dist} Summary: Spacewalk branding data @@ -89,6 +89,9 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Tue Feb 18 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.33-1 +- The fix should have been the other way round... + * Tue Feb 18 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.32-1 - do not use fixed size - add space after alphabar result sign diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index be52c9c..59395bd 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -2.1.32-1 branding/ +2.1.33-1 branding/ commit 3a46ec842fe627c046adf63e8d19b683ea47c7ea Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 19:52:58 2014 +0100 The fix should have been the other way round... diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 012f911..f58ecb3 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -27,7 +27,7 @@ Requires: httpd Requires: bootstrap <= 3.0.0 Requires: bootstrap-datepicker Requires: font-awesome >= 4.0.0 -Requires: jquery-timepicker <= 1.3.3 +Requires: jquery-timepicker >= 1.3.2 Requires: roboto >= 1.2 Requires: pwstrength-bootstrap

10 years, 4 months

1
0
0 / 0

Changes to 'refs/tags/spacewalk-branding-2.1.32-1'

by mkollar

Tag 'spacewalk-branding-2.1.32-1' created by Matej Kollar <mkollar(a)redhat.com> at 2014-02-18 16:05 +0000 Tagging package [spacewalk-branding] version [2.1.32-1] in directory [branding/]. Changes since spacewalk-java-2.1.155-1: Matej Kollar (1): Automatic commit of package [spacewalk-branding] release [2.1.32-1]. --- branding/spacewalk-branding.spec | 6 +++++- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) ---

10 years, 4 months

1
0
0 / 0

branding/spacewalk-branding.spec rel-eng/packages

by mkollar

branding/spacewalk-branding.spec | 6 +++++- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 093fbdf79a8e141ffcc67a9a5accd708844e6e08 Author: Matej Kollar <mkollar(a)redhat.com> Date: Tue Feb 18 17:05:26 2014 +0100 Automatic commit of package [spacewalk-branding] release [2.1.32-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 726de2a..012f911 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -9,7 +9,7 @@ %endif Name: spacewalk-branding -Version: 2.1.31 +Version: 2.1.32 Release: 1%{?dist} Summary: Spacewalk branding data @@ -89,6 +89,10 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Tue Feb 18 2014 Matej Kollar <mkollar(a)redhat.com> 2.1.32-1 +- do not use fixed size +- add space after alphabar result sign + * Mon Feb 17 2014 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.31-1 - 1064573 - sidenav css should respect valid html constructions diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index 4ad39b7..be52c9c 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -2.1.31-1 branding/ +2.1.32-1 branding/

10 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits February 2014