backend/common/rhnApache.py | 28 backend/common/rhnRepository.py | 68 - backend/common/rhnTB.py | 34 backend/common/rhn_rpm.py | 2 backend/satellite_exporter/exporter/dumper.py | 2 backend/satellite_exporter/exporter/exportLib.py | 6 backend/satellite_tools/disk_dumper/dumper.py | 56 - backend/satellite_tools/satsync.py | 68 + backend/satellite_tools/sync_handlers.py | 16 backend/satellite_tools/updatePackages.py | 6 backend/server/action/packages.py | 10 backend/server/action/solarispkgs.py | 10 backend/server/handlers/app/packages.py | 51 - backend/server/handlers/config/rhn_config_management.py | 2 backend/server/handlers/xmlrpc/errata.py | 33 backend/server/handlers/xmlrpc/getMethod.py | 11 backend/server/handlers/xmlrpc/queue.py | 101 +- backend/server/handlers/xmlrpc/up2date.py | 198 ++-- backend/server/importlib/backend.py | 10 backend/server/importlib/packageImport.py | 3 backend/server/rhnChannel.py | 3 backend/server/rhnDependency.py | 130 +-- backend/spacewalk-backend.spec | 100 ++ branding/img/nav/utilBkgdRight.png |binary branding/spacewalk-branding.spec | 16 branding/templates/footer.pxt | 2 client/rhel/rhn-client-tools/rhn-client-tools.spec | 22 client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py | 1 client/rhel/rhnsd/rhnsd.spec | 15 client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 12 client/solaris/smartpm/smartpm.spec | 8 client/tools/osad/osad.spec | 22 client/tools/rhn-virtualization/rhn-virtualization.spec | 19 client/tools/rhn-virtualization/virtualization/domain_directory.py | 61 - client/tools/rhn-virtualization/virtualization/start_domain.py | 15 client/tools/rhn-virtualization/virtualization/support.py | 13 client/tools/rhnpush/rhnpush.spec | 8 client/tools/spacewalk-koan/spacewalk-koan.spec | 20 client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py | 99 +- java/code/src/com/redhat/rhn/common/conf/Config.java | 337 -------- java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 405 ++++++++++ java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 13 java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 2 java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml | 1 java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 97 +- java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 18 java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 47 + java/code/src/com/redhat/rhn/common/localization/LocalizationService.java | 5 java/code/src/com/redhat/rhn/common/messaging/ActionExecutor.java | 4 java/code/src/com/redhat/rhn/common/messaging/MessageQueue.java | 27 java/code/src/com/redhat/rhn/common/messaging/SmtpMail.java | 5 java/code/src/com/redhat/rhn/common/messaging/test/MessageQueueTest.java | 2 java/code/src/com/redhat/rhn/common/security/PermissionException.java | 3 java/code/src/com/redhat/rhn/common/security/SessionSwap.java | 17 java/code/src/com/redhat/rhn/common/security/acl/BaseHandler.java | 3 java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java | 8 java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java | 64 + java/code/src/com/redhat/rhn/common/security/acl/MonitoringAclHandler.java | 5 java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.java | 6 java/code/src/com/redhat/rhn/common/security/acl/SystemAclHandler.java | 16 java/code/src/com/redhat/rhn/common/security/acl/test/AccessTest.java | 10 java/code/src/com/redhat/rhn/common/security/acl/test/MonitoringAclHandlerTest.java | 17 java/code/src/com/redhat/rhn/common/translation/test/TestTranslations.java | 2 java/code/src/com/redhat/rhn/common/util/ServletUtils.java | 3 java/code/src/com/redhat/rhn/common/validator/DataConverter.java | 6 java/code/src/com/redhat/rhn/common/validator/NumericConstraint.java | 4 java/code/src/com/redhat/rhn/common/validator/RequiredIfConstraint.java | 16 java/code/src/com/redhat/rhn/common/validator/StringConstraint.java | 8 java/code/src/com/redhat/rhn/common/validator/Validator.java | 1 java/code/src/com/redhat/rhn/common/validator/ValidatorResult.java | 2 java/code/src/com/redhat/rhn/common/validator/ValidatorService.java | 12 java/code/src/com/redhat/rhn/domain/action/ActionFactory.java | 32 java/code/src/com/redhat/rhn/domain/channel/Channel.java | 30 java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 13 java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java | 4 java/code/src/com/redhat/rhn/domain/channel/DistChannelMap.java | 2 java/code/src/com/redhat/rhn/domain/channel/PrivateChannelFamily.java | 6 java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java | 4 java/code/src/com/redhat/rhn/domain/channel/SelectableChannelVersion.java | 4 java/code/src/com/redhat/rhn/domain/channel/test/ChannelFamilyFactoryTest.java | 4 java/code/src/com/redhat/rhn/domain/common/ArchType.java | 3 java/code/src/com/redhat/rhn/domain/config/ConfigFile.java | 5 java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java | 179 +--- java/code/src/com/redhat/rhn/domain/entitlement/Entitlement.java | 3 java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 25 java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml | 21 java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrata.java | 2 java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java | 14 java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml | 1 java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 74 + java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java | 69 - java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.hbm.xml | 7 java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java | 46 + java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java | 2 java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java | 4 java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 65 - java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeTest.java | 40 java/code/src/com/redhat/rhn/domain/monitoring/MonitoringFactory.java | 2 java/code/src/com/redhat/rhn/domain/monitoring/notification/ContactGroupMember.java | 5 java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java | 32 java/code/src/com/redhat/rhn/domain/org/OrgFactory.java | 20 java/code/src/com/redhat/rhn/domain/org/OrgImpl.java | 62 - java/code/src/com/redhat/rhn/domain/org/SystemMigration.java | 6 java/code/src/com/redhat/rhn/domain/org/SystemMigrationFactory.java | 9 java/code/src/com/redhat/rhn/domain/org/test/OrgFactoryTest.java | 12 java/code/src/com/redhat/rhn/domain/org/test/SystemMigrationFactoryTest.java | 7 java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java | 35 java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java | 14 java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java | 2 java/code/src/com/redhat/rhn/domain/rhnpackage/Patch.java | 4 java/code/src/com/redhat/rhn/domain/rhnpackage/test/PatchSetTest.java | 4 java/code/src/com/redhat/rhn/domain/role/RoleFactory.java | 39 java/code/src/com/redhat/rhn/domain/role/RoleImpl.java | 3 java/code/src/com/redhat/rhn/domain/satellite/CertificateFactory.java | 15 java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory.java | 11 java/code/src/com/redhat/rhn/domain/server/InstalledPackage.java | 2 java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java | 26 java/code/src/com/redhat/rhn/domain/server/Server.java | 51 + java/code/src/com/redhat/rhn/domain/server/ServerFactory.java | 97 +- java/code/src/com/redhat/rhn/domain/server/ServerSnapshot.java | 12 java/code/src/com/redhat/rhn/domain/server/ServerSnapshotTagLink.java | 4 java/code/src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml | 3 java/code/src/com/redhat/rhn/domain/server/SnapshotTag.java | 6 java/code/src/com/redhat/rhn/domain/server/SnapshotTagName.java | 4 java/code/src/com/redhat/rhn/domain/server/test/MonitoredServerTest.java | 8 java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceManufacturer.java | 2 java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.java | 28 java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java | 4 java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml | 9 java/code/src/com/redhat/rhn/domain/task/TaskFactory.java | 58 - java/code/src/com/redhat/rhn/domain/task/test/TaskTest.java | 15 java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java | 1 java/code/src/com/redhat/rhn/domain/token/TokenPackage.java | 8 java/code/src/com/redhat/rhn/domain/token/TokenPackageFactory.java | 4 java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java | 11 java/code/src/com/redhat/rhn/domain/token/test/TokenPackageFactoryTest.java | 4 java/code/src/com/redhat/rhn/domain/user/User.java | 8 java/code/src/com/redhat/rhn/domain/user/UserFactory.java | 278 ++---- java/code/src/com/redhat/rhn/domain/user/legacy/LegacyRhnUserImpl.java | 9 java/code/src/com/redhat/rhn/domain/user/test/UserFactoryTest.java | 20 java/code/src/com/redhat/rhn/domain/user/test/UserTest.java | 15 java/code/src/com/redhat/rhn/frontend/action/DispatchedAction.java | 8 java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java | 28 java/code/src/com/redhat/rhn/frontend/action/channel/ChannelDetailsAction.java | 1 java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchAction.java | 8 java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java | 5 java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddCustomErrataAction.java | 26 java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddErrataAction.java | 14 java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java | 26 java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackageMenuAction.java | 10 java/code/src/com/redhat/rhn/frontend/action/channel/manage/DeleteChannelAction.java | 14 java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 6 java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataFilter.java | 6 java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataIndexAction.java | 14 java/code/src/com/redhat/rhn/frontend/action/channel/manage/ManageChannelsAction.java | 23 java/code/src/com/redhat/rhn/frontend/action/channel/manage/PatchSetListAction.java | 24 java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelConfirmAction.java | 8 java/code/src/com/redhat/rhn/frontend/action/channel/ssm/SelectChannelAction.java | 17 java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java | 260 +++--- java/code/src/com/redhat/rhn/frontend/action/configuration/BaseAddFilesAction.java | 20 java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java | 16 java/code/src/com/redhat/rhn/frontend/action/configuration/files/FileDetailsAction.java | 5 java/code/src/com/redhat/rhn/frontend/action/configuration/files/GlobalRevisionDeploySetup.java | 1 java/code/src/com/redhat/rhn/frontend/action/configuration/files/ManageRevisionSetup.java | 5 java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/ChannelListAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/FileListSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/RankChannelsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/configuration/ssm/SubscribeSubmit.java | 4 java/code/src/com/redhat/rhn/frontend/action/errata/AddPackagesAction.java | 27 java/code/src/com/redhat/rhn/frontend/action/errata/AddPackagesConfirmAction.java | 27 java/code/src/com/redhat/rhn/frontend/action/errata/CloneErrataAction.java | 21 java/code/src/com/redhat/rhn/frontend/action/errata/DeleteErratumAction.java | 18 java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java | 42 - java/code/src/com/redhat/rhn/frontend/action/errata/ErrataListBaseAction.java | 15 java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java | 17 java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushAction.java | 26 java/code/src/com/redhat/rhn/frontend/action/errata/PublishedErrataAction.java | 15 java/code/src/com/redhat/rhn/frontend/action/errata/UnpublishedErrataAction.java | 25 java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmSetupActionTest.java | 2 java/code/src/com/redhat/rhn/frontend/action/errata/test/RemovePackagesActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/errata/test/UnpublishedDeleteConfirmSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/help/DocSearchSetupAction.java | 41 - java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java | 15 java/code/src/com/redhat/rhn/frontend/action/kickstart/AdvancedModeDetailsAction.java | 41 - java/code/src/com/redhat/rhn/frontend/action/kickstart/BaseKickstartEditAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartAdvancedOptionsAction.java | 31 java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartCloneAction.java | 24 java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java | 59 - java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java | 49 - java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java | 6 java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java | 95 +- java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSubmitAction.java | 177 ---- java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartSoftwareEditAction.java | 41 - java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartTroubleshootingEditAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartVariableAction.java | 18 java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java | 277 ++++-- java/code/src/com/redhat/rhn/frontend/action/kickstart/SystemDetailsEditAction.java | 67 - java/code/src/com/redhat/rhn/frontend/action/kickstart/ViewTreesAction.java | 39 java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java | 187 ++++ java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKickstartableSystemsAction.java | 87 ++ java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartHelperTest.java | 25 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPackageProfileActionTest.java | 15 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartSystemDetailsTest.java | 30 java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java | 12 java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeEditAction.java | 35 java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java | 15 java/code/src/com/redhat/rhn/frontend/action/monitoring/ProbeSuiteSystemsEditAction.java | 26 java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseFilterEditAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java | 6 java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelConsumeAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelProvideAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgChannelListAction.java | 21 java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java | 21 java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgTrustDetailsAction.java | 14 java/code/src/com/redhat/rhn/frontend/action/multiorg/OrganizationTrustAction.java | 16 java/code/src/com/redhat/rhn/frontend/action/multiorg/SoftwareEntitlementSubscriptionsAction.java | 47 - java/code/src/com/redhat/rhn/frontend/action/multiorg/SystemEntitlementOrgsAction.java | 38 java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustAction.java | 24 java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustListFilter.java | 6 java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgDetailsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java | 6 java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/renderers/BaseFragmentRenderer.java | 18 java/code/src/com/redhat/rhn/frontend/action/renderers/CriticalProbesRenderer.java | 8 java/code/src/com/redhat/rhn/frontend/action/renderers/CriticalSystemsRenderer.java | 6 java/code/src/com/redhat/rhn/frontend/action/renderers/LatestErrataRenderer.java | 4 java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java | 10 java/code/src/com/redhat/rhn/frontend/action/renderers/SystemGroupsRenderer.java | 4 java/code/src/com/redhat/rhn/frontend/action/renderers/TasksRenderer.java | 4 java/code/src/com/redhat/rhn/frontend/action/renderers/WarningProbesRenderer.java | 8 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPatchSetAction.java | 26 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexAction.java | 26 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmAction.java | 26 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/patches/PatchConfirmInstallAction.java | 26 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java | 27 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java | 27 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageSetupAction.java | 18 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/PackageListAction.java | 22 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/ProfilesListAction.java | 17 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/profile/test/SyncActionsTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageInstallationAction.java | 119 -- java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java | 132 +-- java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageUpgradeAction.java | 113 +- java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageVerifyAction.java | 162 +--- java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java | 21 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectRemovePackagesAction.java | 27 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectUpgradePackagesAction.java | 29 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectVerifyPackagesAction.java | 27 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectRemovePackagesActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectVerifyPackagesActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SsmActionTestUtils.java | 22 java/code/src/com/redhat/rhn/frontend/action/satellite/BaseConfigAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java | 3 java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/satellite/MonitoringConfigAction.java | 6 java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java | 9 java/code/src/com/redhat/rhn/frontend/action/satellite/test/MonitoringConfigActionTest.java | 10 java/code/src/com/redhat/rhn/frontend/action/schedule/FailedSystemsAction.java | 22 java/code/src/com/redhat/rhn/frontend/action/schedule/InProgressSystemsAction.java | 22 java/code/src/com/redhat/rhn/frontend/action/ssm/BaseViewLogAction.java | 12 java/code/src/com/redhat/rhn/frontend/action/ssm/ViewAllLogAction.java | 7 java/code/src/com/redhat/rhn/frontend/action/ssm/ViewCompletedLogAction.java | 7 java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogAction.java | 7 java/code/src/com/redhat/rhn/frontend/action/ssm/ViewLogDetailsAction.java | 27 java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java | 3 java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java | 7 java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/SystemEntitlementsSubmitAction.java | 24 java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSetupActionTest.java | 3 java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeAction.java | 40 java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java | 40 java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDetailsAction.java | 17 java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDetailsActionTest.java | 5 java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/VariablesAction.java | 16 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/AddToSSMAction.java | 24 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/RemoveFromSSMAction.java | 24 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SdcHelper.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java | 34 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java | 38 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsForm.java | 8 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 32 java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemOverviewActionTest.java | 8 java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataSetupActionTest.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java | 3 java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java | 27 java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java | 36 java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListSetupAction.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java | 9 java/code/src/com/redhat/rhn/frontend/action/user/AdminUserEditAction.java | 3 java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java | 3 java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAction.java | 16 java/code/src/com/redhat/rhn/frontend/action/user/DisabledListSetupAction.java | 15 java/code/src/com/redhat/rhn/frontend/action/user/EnableConfirmSetupAction.java | 22 java/code/src/com/redhat/rhn/frontend/action/user/UserEditSetupAction.java | 4 java/code/src/com/redhat/rhn/frontend/action/user/UserListAction.java | 16 java/code/src/com/redhat/rhn/frontend/action/user/test/EnableConfirmSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java | 4 java/code/src/com/redhat/rhn/frontend/dto/OrgTrust.java | 4 java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java | 13 java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java | 6 java/code/src/com/redhat/rhn/frontend/dto/UpgradablePackageListItem.java | 13 java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartDto.java | 1 java/code/src/com/redhat/rhn/frontend/events/AbstractDatabaseAction.java | 5 java/code/src/com/redhat/rhn/frontend/events/NewUserEvent.java | 5 java/code/src/com/redhat/rhn/frontend/events/SsmChangeChannelSubscriptionsAction.java | 9 java/code/src/com/redhat/rhn/frontend/events/SsmChangeChannelSubscriptionsEvent.java | 3 java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java | 110 ++ java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesEvent.java | 103 ++ java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java | 129 +++ java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesEvent.java | 87 ++ java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java | 96 ++ java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesEvent.java | 100 ++ java/code/src/com/redhat/rhn/frontend/events/SsmVerifyPackagesAction.java | 105 ++ java/code/src/com/redhat/rhn/frontend/events/SsmVerifyPackagesEvent.java | 79 + java/code/src/com/redhat/rhn/frontend/graphing/GraphGenerator.java | 2 java/code/src/com/redhat/rhn/frontend/integration/IntegrationService.java | 9 java/code/src/com/redhat/rhn/frontend/servlets/EnvironmentFilter.java | 22 java/code/src/com/redhat/rhn/frontend/servlets/HelpDocServlet.java | 4 java/code/src/com/redhat/rhn/frontend/servlets/PxtCookieManager.java | 5 java/code/src/com/redhat/rhn/frontend/servlets/RhnHttpServletRequest.java | 8 java/code/src/com/redhat/rhn/frontend/servlets/test/EnvironmentFilterTest.java | 13 java/code/src/com/redhat/rhn/frontend/servlets/test/PxtCookieManagerTest.java | 15 java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 47 + java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 2 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 212 +++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 11 java/code/src/com/redhat/rhn/frontend/struts/BaseSetHelper.java | 2 java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java | 5 java/code/src/com/redhat/rhn/frontend/struts/RhnHelper.java | 4 java/code/src/com/redhat/rhn/frontend/struts/RhnRequestProcessor.java | 20 java/code/src/com/redhat/rhn/frontend/struts/RhnValidationHelper.java | 16 java/code/src/com/redhat/rhn/frontend/struts/ScrubbingDynaActionForm.java | 4 java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java | 1 java/code/src/com/redhat/rhn/frontend/struts/test/RhnUnpagedListActionTest.java | 14 java/code/src/com/redhat/rhn/frontend/struts/wizard/RhnWizardAction.java | 3 java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java | 34 java/code/src/com/redhat/rhn/frontend/taglibs/SystemTimeMessageTag.java | 3 java/code/src/com/redhat/rhn/frontend/taglibs/list/ColumnTag.java | 1 java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java | 16 java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 14 java/code/src/com/redhat/rhn/frontend/taglibs/list/RadioColumnTag.java | 19 java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/AddToSsmDecorator.java | 5 java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java | 10 java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/test/PageSizeDecoratorTest.java | 5 java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListRhnSetHelper.java | 15 java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSessionSetHelper.java | 11 java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/Listable.java | 3 java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld | 5 java/code/src/com/redhat/rhn/frontend/xmlrpc/BaseHandler.java | 4 java/code/src/com/redhat/rhn/frontend/xmlrpc/DeleteUserException.java | 40 java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelNameException.java | 1 java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java | 10 java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java | 28 java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/org/ChannelOrgHandler.java | 12 java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 4 java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java | 16 java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java | 4 java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/filepreservation/FilePreservationListHandler.java | 14 java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/filepreservation/test/FilePreservationListHandlerTest.java | 14 java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java | 13 java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/test/CryptoKeysHandlerTest.java | 8 java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 47 - java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/keys/test/KeysHandlerTest.java | 4 java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java | 6 java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java | 8 java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java | 99 -- java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/test/SystemDetailsHandlerTest.java | 24 java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java | 11 java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java | 22 java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.java | 21 java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java | 12 java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/test/OrgTrustHandlerTest.java | 8 java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java | 4 java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java | 5 java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java | 6 java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/test/ScheduleHandlerTest.java | 6 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java | 10 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java | 10 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java | 8 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java | 6 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java | 1 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java | 6 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java | 10 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java | 6 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java | 10 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java | 6 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java | 6 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java | 7 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java | 16 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java | 6 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java | 6 java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 116 ++ java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 27 java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java | 21 java/code/src/com/redhat/rhn/frontend/xmlrpc/system/custominfo/test/CustomInfoHandlerTest.java | 4 java/code/src/com/redhat/rhn/frontend/xmlrpc/system/provisioning/snapshot/SnapshotHandler.java | 12 java/code/src/com/redhat/rhn/frontend/xmlrpc/system/search/SystemSearchHandler.java | 18 java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/ServerGroupHandlerTest.java | 10 java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java | 2 java/code/src/com/redhat/rhn/frontend/xmlrpc/systemgroup/ServerGroupHandler.java | 15 java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java | 36 java/code/src/com/redhat/rhn/manager/BaseTransactionCommand.java | 75 + java/code/src/com/redhat/rhn/manager/action/ActionManager.java | 15 java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 23 java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java | 9 java/code/src/com/redhat/rhn/manager/channel/EusReleaseComparator.java | 5 java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java | 3 java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java | 3 java/code/src/com/redhat/rhn/manager/download/DownloadManager.java | 10 java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 9 java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand.java | 44 - java/code/src/com/redhat/rhn/manager/errata/test/ErrataManagerTest.java | 17 java/code/src/com/redhat/rhn/manager/kickstart/IpAddress.java | 4 java/code/src/com/redhat/rhn/manager/kickstart/KickstartCryptoKeyCommand.java | 2 java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java | 6 java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java | 4 java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 51 + java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java | 46 + java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java | 148 +++ java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 249 ++---- java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java | 4 java/code/src/com/redhat/rhn/manager/kickstart/KickstartWizardHelper.java | 41 - java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java | 19 java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java | 275 ++++++ java/code/src/com/redhat/rhn/manager/kickstart/SystemDetailsCommand.java | 57 - java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java | 85 -- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java | 39 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java | 21 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroDeleteCommand.java | 7 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroSyncCommand.java | 6 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java | 10 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java | 10 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileDeleteCommand.java | 13 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java | 8 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java | 12 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 24 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java | 2 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerXMLRPCHelper.java | 8 java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java | 24 java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartManagerTest.java | 152 +++ java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java | 62 - java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardCommandTest.java | 4 java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardHelperTest.java | 9 java/code/src/com/redhat/rhn/manager/kickstart/tree/BaseTreeEditOperation.java | 48 - java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeEditOperation.java | 6 java/code/src/com/redhat/rhn/manager/kickstart/tree/test/TreeEditOperationTest.java | 6 java/code/src/com/redhat/rhn/manager/monitoring/MonitoringManager.java | 40 java/code/src/com/redhat/rhn/manager/monitoring/test/ModifyProbeCommandTest.java | 8 java/code/src/com/redhat/rhn/manager/monitoring/test/MonitoringManagerTest.java | 29 java/code/src/com/redhat/rhn/manager/monitoring/test/ScoutConfigPushCommandTest.java | 4 java/code/src/com/redhat/rhn/manager/org/MigrationManager.java | 16 java/code/src/com/redhat/rhn/manager/org/OrgManager.java | 22 java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java | 4 java/code/src/com/redhat/rhn/manager/org/UpdateOrgSystemEntitlementsCommand.java | 4 java/code/src/com/redhat/rhn/manager/org/test/MigrationManagerTest.java | 11 java/code/src/com/redhat/rhn/manager/org/test/OrgManagerTest.java | 5 java/code/src/com/redhat/rhn/manager/org/test/UpdateOrgSoftwareEntitlementsTest.java | 4 java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java | 3 java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java | 14 java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java | 9 java/code/src/com/redhat/rhn/manager/rhnset/test/RhnSetManagerTest.java | 2 java/code/src/com/redhat/rhn/manager/satellite/ConfigureCertificateCommand.java | 14 java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java | 40 java/code/src/com/redhat/rhn/manager/satellite/SystemCommandExecutor.java | 2 java/code/src/com/redhat/rhn/manager/satellite/UpgradeCommand.java | 105 ++ java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java | 19 java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java | 27 java/code/src/com/redhat/rhn/manager/satellite/test/UpgradeCommandTest.java | 59 + java/code/src/com/redhat/rhn/manager/session/SessionManager.java | 12 java/code/src/com/redhat/rhn/manager/session/test/SessionManagerTest.java | 3 java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java | 18 java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java | 10 java/code/src/com/redhat/rhn/manager/ssm/test/SsmOperationDataPopulatorTest.java | 5 java/code/src/com/redhat/rhn/manager/ssm/test/SsmOperationManagerTest.java | 13 java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java | 16 java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 31 java/code/src/com/redhat/rhn/manager/system/UpdateChildChannelsCommand.java | 4 java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java | 6 java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java | 13 java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.java | 11 java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java | 18 java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminException.java | 51 + java/code/src/com/redhat/rhn/manager/user/UpdateUserCommand.java | 10 java/code/src/com/redhat/rhn/manager/user/UserManager.java | 11 java/code/src/com/redhat/rhn/manager/user/test/UpdateUserCommandTest.java | 3 java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java | 5 java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java | 7 java/code/src/com/redhat/rhn/taskomatic/task/ErrataCacheTask.java | 8 java/code/src/com/redhat/rhn/taskomatic/task/ErrataMailer.java | 5 java/code/src/com/redhat/rhn/taskomatic/task/ErrataQueue.java | 8 java/code/src/com/redhat/rhn/taskomatic/task/KickstartFileSyncTask.java | 3 java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java | 5 java/code/src/com/redhat/rhn/taskomatic/task/SummaryPopulation.java | 3 java/code/src/com/redhat/rhn/taskomatic/task/entitlement/EntitlementQueueDriver.java | 14 java/code/src/com/redhat/rhn/taskomatic/task/entitlement/EntitlementWorker.java | 10 java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheDriver.java | 16 java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheWorker.java | 12 java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueDriver.java | 16 java/code/src/com/redhat/rhn/taskomatic/task/repomd/ChannelRepodataDriver.java | 2 java/code/src/com/redhat/rhn/taskomatic/task/repomd/ChannelRepodataWorker.java | 9 java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java | 11 java/code/src/com/redhat/rhn/taskomatic/task/repomd/FilelistsXmlWriter.java | 10 java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWriter.java | 10 java/code/src/com/redhat/rhn/taskomatic/task/repomd/PackageCapabilityIterator.java | 20 java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 12 java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdIndexData.java | 22 java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdIndexWriter.java | 10 java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdWriter.java | 22 java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java | 51 - java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java | 14 java/code/src/com/redhat/rhn/taskomatic/task/threaded/QueueDriver.java | 4 java/code/src/com/redhat/rhn/taskomatic/task/threaded/TaskQueue.java | 4 java/code/src/com/redhat/rhn/testing/ActionHelper.java | 2 java/code/src/com/redhat/rhn/testing/ChannelTestUtils.java | 4 java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java | 18 java/code/src/com/redhat/rhn/testing/ServerTestUtils.java | 31 java/code/src/com/redhat/rhn/testing/UserTestUtils.java | 8 java/code/src/com/redhat/rhn/webapp/RhnServletListener.java | 12 java/code/src/log4j.properties | 3 java/code/src/org/cobbler/CobblerObject.java | 9 java/code/src/org/cobbler/Profile.java | 7 java/code/src/org/cobbler/SystemRecord.java | 20 java/code/src/org/cobbler/test/DistroTest.java | 2 java/code/src/org/cobbler/test/MockConnection.java | 4 java/code/webapp/WEB-INF/nav/kickstart_details.xml | 32 java/code/webapp/WEB-INF/nav/kickstart_raw_mode.xml | 6 java/code/webapp/WEB-INF/nav/kickstart_tree_details.xml | 4 java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 1 java/code/webapp/WEB-INF/nav/ssm.xml | 7 java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp | 2 java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp | 13 java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_tree_provider.jspf | 25 java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf | 62 + java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf | 9 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf | 26 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf | 46 + java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf | 56 + java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf | 32 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf | 78 + java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf | 27 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf | 33 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf | 21 java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf | 9 java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp | 37 java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp | 14 java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp | 45 - java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp | 51 - java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp | 7 java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp | 83 ++ java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp | 124 +++ java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp | 9 java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp | 89 -- java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp | 2 java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp | 2 java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp | 2 java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 12 java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp | 59 - java/code/webapp/WEB-INF/pages/systems/probes/details.jsp | 36 java/code/webapp/WEB-INF/struts-config.xml | 82 +- java/conf/default/rhn_taskomatic_daemon.conf | 4 java/spacewalk-java.spec | 222 +++++ monitoring/PerlModules/NP/OracleDB/OracleDB.pm | 1 monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec | 8 monitoring/SatConfig/cluster/SatCluster.pm | 18 monitoring/SatConfig/cluster/SatConfig-cluster.spec | 6 monitoring/SputLite/SputLite.spec | 5 monitoring/nocpulse-common/nocpulse-common.spec | 6 monitoring/spacewalk-monitoring/spacewalk-monitoring.spec | 24 projects/oracle-server-scripts/oracle-server-scripts.spec | 8 proxy/installer/configure-proxy.sh | 72 - proxy/installer/spacewalk-proxy-installer.spec | 16 proxy/proxy/broker/rhnRepository.py | 53 - proxy/proxy/rhnShared.py | 8 proxy/proxy/spacewalk-proxy.spec | 20 rel-eng/lib/spacewalk/releng/builder.py | 4 rel-eng/packages/SatConfig-cluster | 2 rel-eng/packages/SputLite | 2 rel-eng/packages/nocpulse-common | 2 rel-eng/packages/oracle-server-scripts | 2 rel-eng/packages/osad | 2 rel-eng/packages/perl-NOCpulse-OracleDB | 2 rel-eng/packages/rhn-client-tools | 2 rel-eng/packages/rhn-virtualization | 2 rel-eng/packages/rhnpush | 2 rel-eng/packages/rhnsd | 2 rel-eng/packages/smartpm | 2 rel-eng/packages/spacewalk | 2 rel-eng/packages/spacewalk-backend | 2 rel-eng/packages/spacewalk-branding | 2 rel-eng/packages/spacewalk-config | 2 rel-eng/packages/spacewalk-java | 2 rel-eng/packages/spacewalk-koan | 2 rel-eng/packages/spacewalk-monitoring | 2 rel-eng/packages/spacewalk-proxy | 2 rel-eng/packages/spacewalk-proxy-installer | 2 rel-eng/packages/spacewalk-proxy-selinux | 2 rel-eng/packages/spacewalk-schema | 2 rel-eng/packages/spacewalk-search | 2 rel-eng/packages/spacewalk-selinux | 2 rel-eng/packages/spacewalk-setup | 2 rel-eng/packages/spacewalk-utils | 2 rel-eng/packages/spacewalk-web | 2 rel-eng/packages/yum-rhn-plugin | 2 satellite/install/install.pl | 2 schema/spacewalk/rhnsat/tables/rhnActionType_data.sql | 18 schema/spacewalk/spacewalk-schema.spec | 22 schema/spacewalk/upgrade/spacewalk-0.2-spacewalk-0.3/100-rhnCpuArch-i86pc.sql | 11 schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/123-rhnActionType_data.sql | 53 + schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/124-rhn_probe_param_value.sql | 27 schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-upgrade_kickstart_profiles.sql | 20 search-server/spacewalk-search.spec | 8 selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux-enable | 2 selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | 5 selinux/spacewalk-selinux/spacewalk-selinux-enable | 2 selinux/spacewalk-selinux/spacewalk-selinux.spec | 9 spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf | 4 spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 4 spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf | 9 spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/tomcat5/server.xml | 394 +++++++++ spacewalk/config/satellite-rules.conf | 4 spacewalk/config/spacewalk-config.spec | 12 spacewalk/package/spacewalk.spec | 11 spacewalk/setup/bin/spacewalk-setup | 1 spacewalk/setup/lib/Spacewalk/Setup.pm | 6 spacewalk/setup/share/oracle/upgrade-db-10g.sh | 3 spacewalk/setup/share/oracle/upgrade-db.sh | 3 spacewalk/setup/share/upgrade/rhn-load-config.pl | 4 spacewalk/setup/share/upgrade/rhn-update-monitoring.pl | 65 + spacewalk/setup/spacewalk-setup.spec | 21 utils/Makefile | 7 utils/spacewalk-api | 142 +++ utils/spacewalk-utils.spec | 12 web/html/applications/rhn-proxy/4.0/httpd/cobbler-proxy.conf | 9 web/html/applications/rhn-proxy/4.0/httpd/httpd.conf | 5 web/html/applications/rhn-proxy/4.0/install-rhn-proxy.xml | 6 web/html/applications/rhn-proxy/4.1/httpd/cobbler-proxy.conf | 9 web/html/applications/rhn-proxy/4.1/httpd/httpd.conf | 5 web/html/applications/rhn-proxy/4.1/install-rhn-proxy.xml | 6 web/html/applications/rhn-proxy/4.2/httpd/cobbler-proxy.conf | 9 web/html/applications/rhn-proxy/4.2/httpd/httpd.conf | 5 web/html/applications/rhn-proxy/4.2/install-rhn-proxy.xml | 6 web/html/applications/rhn-proxy/5.0/httpd/cobbler-proxy.conf | 9 web/html/applications/rhn-proxy/5.0/httpd/httpd.conf | 5 web/html/applications/rhn-proxy/5.0/install-rhn-proxy.xml | 6 web/html/applications/rhn-proxy/5.1/httpd/cobbler-proxy.conf | 9 web/html/applications/rhn-proxy/5.1/install-rhn-proxy.xml | 6 web/html/applications/rhn-proxy/5.2/httpd/cobbler-proxy.conf | 9 web/html/applications/rhn-proxy/5.2/install-rhn-proxy.xml | 6 web/html/errors/403.html | 2 web/html/errors/404.html | 2 web/html/errors/413.html | 2 web/html/errors/500.html | 2 web/html/nav/sitenav-authenticated.xml | 4 web/html/nav/ssm.xml | 7 web/html/network/systems/ssm/index.pxt | 2 web/html/network/systems/ssm/provisioning/kickstart.pxt | 28 web/html/network/systems/ssm/provisioning/kickstart_options.pxt | 61 - web/html/network/systems/ssm/provisioning/missing_packages.pxt | 39 web/modules/sniglets/Sniglets/AppInstall.pm | 11 web/spacewalk-web.spec | 28 686 files changed, 10074 insertions(+), 5993 deletions(-)
New commits: commit ac8941eed03bef6babc9caff3c47ae1a02a357ff Merge: a54eb73... 953f234... Author: Justin Sherrill jsherril@redhat.com Date: Wed Jul 22 14:14:38 2009 -0400
merge conflict
diff --cc java/code/src/com/redhat/rhn/domain/channel/Channel.java index b7f8d4d,ca5071e..303fa7d --- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java +++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java @@@ -794,46 -795,30 +798,72 @@@ public class Channel extends BaseDomain public boolean containsDistributions() { return ChannelFactory.containsDistributions(this); } + + /** + * @return Returns the contentSources. + */ + public Set<ContentSource> getContentSources() { + return contentSources; + } + + + /** + * @param contentSourcesIn The contentSources to set. + */ + public void setContentSources(Set<ContentSource> contentSourcesIn) { + this.contentSources = contentSourcesIn; + } + + /** + * Set the yum content source, if one is already set, it will be replaced + * if null or '' is passed in, all content sources will be removed. + * @param url the url of the yum repo + */ + public void setYumContentSource(String url) { + if (StringUtils.isEmpty(url)) { + if (!this.getContentSources().isEmpty()) { + this.getContentSources().clear(); + } + } + else { + if (this.getContentSources().isEmpty()) { + ContentSource cs = new ContentSource(); + cs.setChannel(this); + cs.setSourceUrl(url); + cs.setType(ChannelFactory.CONTENT_SOURCE_TYPE_YUM); + this.getContentSources().add(cs); + } + else { + this.getContentSources().iterator().next().setSourceUrl(url); + } + } + ChannelFactory.save(this); + } + + + /** + * get the compatible checksum type to be used for repomd.xml + * based on channel release. If its RHEL-5 we use sha1 + * anything newer will be sha256. + * @return checksumType + */ + public String getChecksumType() { + Channel toConsider = this; + while (toConsider.getParentChannel() != null) { + toConsider = toConsider.getParentChannel(); + } + DistChannelMap channelDist = ChannelFactory.lookupDistChannelMap(toConsider); + if (channelDist != null) { + String release = channelDist.getRelease(); + // If channel or parent is RHEL-5 use sha1, else use sha256 + if (toConsider.isCustom() || sha1compatiblechannels.contains(release)) { + return CHECKSUM_SHA_1; + } + else { + return CHECKSUM_SHA_256; + } + } + // default to sha256 + return CHECKSUM_SHA_256; + } } diff --cc java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 2499e27,a8952f6..a01a024 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@@ -8243,9 -8272,18 +8272,21 @@@ Follow this url to see the full list o <trans-unit id="snapshots.configchannel"> <source>Configuration Channels Updated</source> </trans-unit> + <trans-unit id="channel.edit.repo.neversynced"> + <source>This repo has never been synced.</source> + </trans-unit> + <trans-unit id="ssm.provision.scheduled"> + <source>Successfully scheduled {0} system(s) for provisioning.</source> + </trans-unit> + <trans-unit id="ssm.package.install.operationname"> + <source>Schedule Package Installations</source> + </trans-unit> + <trans-unit id="ssm.package.upgrade.operationname"> + <source>Schedule Package Upgrades</source> + </trans-unit> + <trans-unit id="ssm.package.verify.operationname"> + <source>Schedule Package Verifications</source> + </trans-unit> <trans-unit id="kickstart.cobbler.distro.syncfail"> <source> The following is a list of errors gathered while Spacewalk attempts to
commit 953f2345c133524730bab6326754babac32c6753 Author: Mike McCune mmccune@redhat.com Date: Wed Jul 22 09:51:04 2009 -0700
checkstyle
diff --git a/java/code/src/com/redhat/rhn/manager/satellite/test/UpgradeCommandTest.java b/java/code/src/com/redhat/rhn/manager/satellite/test/UpgradeCommandTest.java index 764775e..d7872f6 100644 --- a/java/code/src/com/redhat/rhn/manager/satellite/test/UpgradeCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/satellite/test/UpgradeCommandTest.java @@ -14,7 +14,6 @@ */ package com.redhat.rhn.manager.satellite.test;
-import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.KickstartSession;
commit 936cf4d7144ca7c8ad9ee9877e1d7b84d4347fd0 Author: Mike McCune mmccune@redhat.com Date: Wed Jul 22 09:18:13 2009 -0700
512814 - unit test fix
diff --git a/java/code/src/com/redhat/rhn/manager/satellite/test/UpgradeCommandTest.java b/java/code/src/com/redhat/rhn/manager/satellite/test/UpgradeCommandTest.java index 4175fb5..764775e 100644 --- a/java/code/src/com/redhat/rhn/manager/satellite/test/UpgradeCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/satellite/test/UpgradeCommandTest.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.manager.satellite.test;
+import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.KickstartSession; @@ -52,8 +53,8 @@ public class UpgradeCommandTest extends BaseTestCaseWithUser { KickstartFactory.lookupDefaultKickstartSessionForKickstartData(ksd); assertNotNull(ksession);
- assertNull(TaskFactory.getTaskListByNameLike( - UpgradeCommand.UPGRADE_KS_PROFILES)); - + l = TaskFactory.getTaskListByNameLike( + UpgradeCommand.UPGRADE_KS_PROFILES); + assertTrue((l == null || l.isEmpty())); } }
commit cae1948bd93644f8af7e330941d018714cb1f629 Author: Devan Goodwin dgoodwin@redhat.com Date: Wed Jul 22 11:40:41 2009 -0300
Automatic commit of package [osad] release [5.9.17-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 7f7add2..621b971 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -9,7 +9,7 @@ Group: System Environment/Daemons License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 5.9.16 +Version: 5.9.17 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -241,6 +241,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvvi {}
# $Id$ %changelog +* Wed Jul 22 2009 Devan Goodwin dgoodwin@redhat.com 5.9.17-1 +- Disable osad selinux for Fedora 11. (dgoodwin@redhat.com) + * Mon Jul 20 2009 Devan Goodwin dgoodwin@redhat.com 5.9.16-1 - Add osad BuildRequires for python-devel. (dgoodwin@redhat.com)
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index 20e08db..5d08fc4 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.9.16-1 client/tools/osad/ +5.9.17-1 client/tools/osad/
commit 4caf9e06a6268beb6ca5bf455ca6d8d207eaa942 Author: Devan Goodwin dgoodwin@redhat.com Date: Wed Jul 22 11:39:11 2009 -0300
Disable osad selinux for Fedora 11.
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index f4f003f..7f7add2 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -54,10 +54,14 @@ OSA dispatcher get message from Spacewalk server that some command is need to execute on client. The message is transported via jabber protocol to OSAD agent.
+%define include_selinux_package 1 + %if 0%{?rhel} && 0%{?rhel} <= 4 %define include_selinux_package 0 -%else -%define include_selinux_package 1 +%endif + +%if 0%{?fedora} == 11 +%define include_selinux_package 0 %endif
%if %{include_selinux_package}
commit 40ec040a6101e1efa1458d4623702c0dae16d28c Author: Devan Goodwin dgoodwin@redhat.com Date: Wed Jul 22 10:17:03 2009 -0300
Automatic commit of package [spacewalk] release [0.6.3-1].
diff --git a/rel-eng/packages/spacewalk b/rel-eng/packages/spacewalk index c981907..69083a6 100644 --- a/rel-eng/packages/spacewalk +++ b/rel-eng/packages/spacewalk @@ -1 +1 @@ -0.6.2-1 spacewalk/package/ +0.6.3-1 spacewalk/package/ diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec index ca2c63a..f328895 100644 --- a/spacewalk/package/spacewalk.spec +++ b/spacewalk/package/spacewalk.spec @@ -1,6 +1,6 @@ %define release_name Alpha Name: spacewalk -Version: 0.6.2 +Version: 0.6.3 Release: 1%{?dist} Summary: Spacewalk Systems Management Application URL: https://fedorahosted.org/spacewalk @@ -95,6 +95,9 @@ rm -rf %{buildroot} /%{_sysconfdir}/spacewalk-release
%changelog +* Wed Jul 22 2009 Devan Goodwin dgoodwin@redhat.com 0.6.3-1 +- Re-enable selinux for everything but Fedora 11. (dgoodwin@redhat.com) + * Mon Jul 20 2009 Devan Goodwin dgoodwin@redhat.com 0.6.2-1 - Disabling spacewalk selinux support temporarily. (dgoodwin@redhat.com)
commit 52e3bb1c96f537c561642a9f6ebacdfa98c86298 Author: Devan Goodwin dgoodwin@redhat.com Date: Wed Jul 22 10:13:42 2009 -0300
Re-enable selinux for everything but Fedora 11.
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec index 895c512..ca2c63a 100644 --- a/spacewalk/package/spacewalk.spec +++ b/spacewalk/package/spacewalk.spec @@ -62,10 +62,13 @@ Requires: spacewalk-monitoring # Requires: rhn_solaris_bootstrap_5_1_0_3
# SELinux -#Requires: spacewalk-selinux -#Requires: jabberd-selinux -#Requires: osa-dispatcher-selinux -#Requires: spacewalk-monitoring-selinux +%if 0%{?fedora} == 11 +%else +Requires: spacewalk-selinux +Requires: jabberd-selinux +Requires: osa-dispatcher-selinux +Requires: spacewalk-monitoring-selinux +%endif
%description
commit 2119b1f1cb0310df61a443d7a8d2ff39ce504728 Author: John Matthews jmatthew@redhat.com Date: Wed Jul 22 08:23:05 2009 -0400
Automatic commit of package [spacewalk-backend] release [0.6.22-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 44d7dd6..4037804 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 0.6.21 +Version: 0.6.22 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -568,6 +568,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$ %changelog +* Wed Jul 22 2009 John Matthews jmatthew@redhat.com 0.6.22-1 +- 511283 - Package compare between db and cache should see if the db is newer + than cache and only then import the content. (pkilambi@redhat.com) + * Tue Jul 21 2009 John Matthews jmatthew@redhat.com 0.6.21-1 - 512936 - Changing the custom channel rule to always defalt to org 1 for custom channels unless --org option is used. This will avoid the confusion of diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 7f82b55..b232b7a 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.21-1 backend/ +0.6.22-1 backend/
commit 13afa1173f92e893a8a9390fc2e3116293bb7598 Author: John Matthews jmatthew@redhat.com Date: Wed Jul 22 08:22:46 2009 -0400
Automatic commit of package [spacewalk-java] release [0.6.34-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 933a515..6aba9bc 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -12,7 +12,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.33 +Version: 0.6.34 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -250,6 +250,10 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
%changelog +* Wed Jul 22 2009 John Matthews jmatthew@redhat.com 0.6.34-1 +- 512814 - adding spot to add 'upgrade' logic to our startup of tomact. + (mmccune@redhat.com) + * Tue Jul 21 2009 John Matthews jmatthew@redhat.com 0.6.33-1 - 512679 - Fix to guess a sensible default virt path for Xen/KVM virt type (paji@redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 31f2495..20a093c 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.33-1 java/ +0.6.34-1 java/
commit 20af6df15ded643a047ed28c255d20ffa69c39f0 Author: John Matthews jmatthew@redhat.com Date: Wed Jul 22 08:22:21 2009 -0400
Automatic commit of package [spacewalk-schema] release [0.6.14-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 4b9b8f3..5f359ca 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -0.6.13-1 schema/spacewalk/ +0.6.14-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index eac9ac9..e9ce945 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -2,7 +2,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server
-Version: 0.6.13 +Version: 0.6.14 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-schema-upgrade*
%changelog +* Wed Jul 22 2009 John Matthews jmatthew@redhat.com 0.6.14-1 +- 512814 - tickle the upgrade logic (mmccune@redhat.com) + * Thu Jul 16 2009 Miroslav Suchy msuchy@redhat.com 0.6.13-1 - 512104 - add sshbannerignore parametr to existing probes which use ssh
commit 94020be75311d7cf481e1dc5d9fe72f1e23ed172 Author: Pradeep Kilambi pkilambi@redhat.com Date: Tue Jul 21 20:21:20 2009 -0400
511283 - Package compare between db and cache should see if the db is newer than cache and only then import the content.
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py index 601d131..40458ad 100644 --- a/backend/satellite_tools/satsync.py +++ b/backend/satellite_tools/satsync.py @@ -1004,7 +1004,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation)) # file is modified too; re-download m_fs_packages.append((package_id, final_path))
- if (l_timestamp == db_timestamp and md5sum == db_md5sum and + if (l_timestamp <= db_timestamp and md5sum == db_md5sum and package_size == db_package_size and final_path == db_path): # Same package return
commit 43aff0b73ba4d7d0187aedd2be16c1ee79af4ebf Author: Mike McCune mmccune@redhat.com Date: Tue Jul 21 14:31:51 2009 -0700
512814 - tickle the upgrade logic
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-upgrade_kickstart_profiles.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-upgrade_kickstart_profiles.sql new file mode 100644 index 0000000..4a0a510 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-upgrade_kickstart_profiles.sql @@ -0,0 +1,20 @@ +-- +-- Copyright (c) 2008 Red Hat, Inc. +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- Red Hat trademarks are not licensed under GPLv2. No permission is +-- granted to use or replicate Red Hat trademarks that are incorporated +-- in this software or its documentation. +-- +-- +-- +-- + +INSERT INTO rhnTaskQueue (org_id, task_name, task_data) +VALUES (1, 'upgrade_satellite_kickstart_profiles', 0);
commit 8f94b49ce1dd35671f627bd4161e6355631d00f1 Author: Mike McCune mmccune@redhat.com Date: Tue Jul 21 14:22:17 2009 -0700
512814 - adding spot to add 'upgrade' logic to our startup of tomact.
Now coders can add an entry to rhnTaskQueue to indicate to our Java code that we want to run a set of business logic during an upgrade.
diff --git a/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml b/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml index 4b32495..276b5e8 100644 --- a/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml @@ -33,4 +33,13 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" and task_data = :data and earliest = :earliest]]> </query>
+ <sql-query name="Task.lookupByNameLike"> + <![CDATA[SELECT {t.*} + FROM rhnTaskQueue {t} + WHERE t.task_name like :namelike + ]]> + <return alias="t" class="com.redhat.rhn.domain.task.Task" /> + </sql-query> + + </hibernate-mapping> diff --git a/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java b/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java index 70c71f1..50149eb 100644 --- a/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java +++ b/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java @@ -74,6 +74,16 @@ public class TaskFactory extends HibernateFactory { }
/** + * Remove a completed Task from the queue. + * + * @param taskIn to remove + */ + public static void remove(Task taskIn) { + singleton.removeObject(taskIn); + } + + + /** * Lookups up a task. * @param org The org containing the task * @param name The name of the task @@ -126,4 +136,15 @@ public class TaskFactory extends HibernateFactory {
return c.list(); } + + /** + * Lookup a list of Tasks who's name start with passed in param + * @param nameIn to lookup + * @return List of Tasks or null if not found. + */ + public static List getTaskListByNameLike(String nameIn) { + return HibernateFactory.getSession().getNamedQuery("Task.lookupByNameLike") + .setString("namelike", nameIn + "%") + .list(); + } } diff --git a/java/code/src/com/redhat/rhn/domain/task/test/TaskTest.java b/java/code/src/com/redhat/rhn/domain/task/test/TaskTest.java index 2d9333f..c4559d1 100644 --- a/java/code/src/com/redhat/rhn/domain/task/test/TaskTest.java +++ b/java/code/src/com/redhat/rhn/domain/task/test/TaskTest.java @@ -24,6 +24,8 @@ import com.redhat.rhn.testing.UserTestUtils;
import org.hibernate.Session;
+import java.util.List; + /** * TaskTest * @version $Rev$ @@ -61,4 +63,17 @@ public class TaskTest extends RhnBaseTestCase { t3.setName("foo"); assertFalse("t2 should not be equal to t3", t2.equals(t3)); } + + public void testLookupNameLike() throws Exception { + Org org = UserTestUtils.findNewOrg("testOrg"); + String testname = "task_object_unit_test_" + TestUtils.randomString(); + Long testdata = new Long(42); + Task t = TaskFactory.createTask(org, testname, testdata); + + List lookedup = TaskFactory.getTaskListByNameLike("task_object_unit_test_"); + assertNotNull(lookedup); + assertTrue(lookedup.size() > 0); + assertTrue(lookedup.get(0) != null); + assertTrue(lookedup.get(0) instanceof Task); + } } diff --git a/java/code/src/com/redhat/rhn/manager/BaseTransactionCommand.java b/java/code/src/com/redhat/rhn/manager/BaseTransactionCommand.java new file mode 100644 index 0000000..1f47b46 --- /dev/null +++ b/java/code/src/com/redhat/rhn/manager/BaseTransactionCommand.java @@ -0,0 +1,75 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.manager; + +import com.redhat.rhn.common.hibernate.HibernateFactory; + +import org.apache.log4j.Logger; +import org.hibernate.HibernateException; + +/** + * BaseTransactionCommand - simple baseclass to hold logic for handling tx + * + * @version $Rev$ + */ +public class BaseTransactionCommand { + + private Logger log; + + /** + * Constructor + * @param logIn to use. + */ + public BaseTransactionCommand(Logger logIn) { + log = logIn; + } + + protected void handleTransaction() { + boolean committed = false; + + try { + HibernateFactory.commitTransaction(); + committed = true; + + if (log.isDebugEnabled()) { + log.debug("Transaction committed"); + } + } + catch (HibernateException e) { + log.error("Rolling back transaction", e); + } + finally { + try { + if (!committed) { + try { + if (log.isDebugEnabled()) { + log.debug("Rolling back transaction"); + } + HibernateFactory.rollbackTransaction(); + } + catch (HibernateException e) { + final String msg = "Additional error during rollback"; + log.warn(msg, e); + } + } + } + finally { + // cleanup the session + HibernateFactory.closeSession(); + } + } + } + +} diff --git a/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand.java b/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand.java index fdff195..547b78b 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand.java +++ b/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand.java @@ -25,12 +25,12 @@ import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.frontend.dto.ErrataCacheDto; +import com.redhat.rhn.manager.BaseTransactionCommand; import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.system.SystemManager;
import org.apache.log4j.Logger; -import org.hibernate.HibernateException;
import java.util.ArrayList; import java.util.HashMap; @@ -43,7 +43,7 @@ import java.util.Map; * UpdateErrataCacheCommand * @version $Rev$ */ -public class UpdateErrataCacheCommand { +public class UpdateErrataCacheCommand extends BaseTransactionCommand { private static Logger log = Logger .getLogger(UpdateErrataCacheCommand.class);
@@ -51,6 +51,7 @@ public class UpdateErrataCacheCommand { * Default constructor */ public UpdateErrataCacheCommand() { + super(log); }
/** @@ -280,42 +281,6 @@ public class UpdateErrataCacheCommand { return retval;
} - - protected void handleTransaction() { - boolean committed = false; - - try { - HibernateFactory.commitTransaction(); - committed = true; - - if (log.isDebugEnabled()) { - log.debug("Transaction committed"); - } - } - catch (HibernateException e) { - log.error("Rolling back transaction", e); - } - finally { - try { - if (!committed) { - try { - if (log.isDebugEnabled()) { - log.debug("Rolling back transaction"); - } - HibernateFactory.rollbackTransaction(); - } - catch (HibernateException e) { - final String msg = "Additional error during rollback"; - log.warn(msg, e); - } - } - } - finally { - // cleanup the session - HibernateFactory.closeSession(); - } - } - }
private void processServer(Long serverId, Org org) { Server server = SystemManager.lookupByIdAndOrg(serverId, org); diff --git a/java/code/src/com/redhat/rhn/manager/satellite/UpgradeCommand.java b/java/code/src/com/redhat/rhn/manager/satellite/UpgradeCommand.java new file mode 100644 index 0000000..f2fd91f --- /dev/null +++ b/java/code/src/com/redhat/rhn/manager/satellite/UpgradeCommand.java @@ -0,0 +1,105 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.manager.satellite; + +import com.redhat.rhn.common.hibernate.HibernateFactory; +import com.redhat.rhn.domain.kickstart.KickstartData; +import com.redhat.rhn.domain.kickstart.KickstartFactory; +import com.redhat.rhn.domain.kickstart.KickstartSession; +import com.redhat.rhn.domain.task.Task; +import com.redhat.rhn.domain.task.TaskFactory; +import com.redhat.rhn.manager.BaseTransactionCommand; +import com.redhat.rhn.manager.kickstart.KickstartSessionCreateCommand; + +import org.apache.log4j.Logger; + +import java.util.List; + + +/** + * Class responsible for executing one-time upgrade logic + * + * @version $Rev$ + */ +public class UpgradeCommand extends BaseTransactionCommand { + + /** + * Logger for this class + */ + private static Logger log = Logger.getLogger(UpgradeCommand.class); + + public static final String UPGRADE_TASK_NAME = "upgrade_satellite_"; + public static final String UPGRADE_KS_PROFILES = + UPGRADE_TASK_NAME + "kickstart_profiles"; + + /** + * Constructor + */ + public UpgradeCommand() { + super(log); + } + + + /** + * Excute the upgrade step + */ + public void store() { + try { + HibernateFactory.getSession().beginTransaction(); + List upgradeTasks = TaskFactory.getTaskListByNameLike(UPGRADE_TASK_NAME); + // Loop over upgrade tasks and execute the steps. + for (int i = 0; i < upgradeTasks.size(); i++) { + Task t = (Task) upgradeTasks.get(i); + // Use WARN because we want this logged. + if (t != null) { + log.warn("got upgrade task: " + t.getName()); + if (t.getName().equals(UPGRADE_KS_PROFILES)) { + processKickstartProfiles(); + TaskFactory.remove(t); + } + } + } + } + catch (Exception e) { + log.error("Problem upgrading!", e); + HibernateFactory.rollbackTransaction(); + + } + finally { + handleTransaction(); + } + } + + private void processKickstartProfiles() { + // Use WARN here because we want this operation logged. + log.warn("Processing ks profiles."); + List allKickstarts = KickstartFactory.listAllKickstartData(); + for (int i = 0; i < allKickstarts.size(); i++) { + KickstartData ksdata = (KickstartData) allKickstarts.get(i); + KickstartSession ksession = + KickstartFactory.lookupDefaultKickstartSessionForKickstartData(ksdata); + if (ksession == null) { + log.warn("Kickstart does not have a session: id: " + ksdata.getId() + + " label: " + ksdata.getLabel()); + KickstartSessionCreateCommand kcmd = new KickstartSessionCreateCommand( + ksdata.getOrg(), ksdata); + kcmd.store(); + log.warn("Created kickstart session and key"); + } + + } + } + +} diff --git a/java/code/src/com/redhat/rhn/manager/satellite/test/UpgradeCommandTest.java b/java/code/src/com/redhat/rhn/manager/satellite/test/UpgradeCommandTest.java new file mode 100644 index 0000000..4175fb5 --- /dev/null +++ b/java/code/src/com/redhat/rhn/manager/satellite/test/UpgradeCommandTest.java @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.manager.satellite.test; + +import com.redhat.rhn.domain.kickstart.KickstartData; +import com.redhat.rhn.domain.kickstart.KickstartFactory; +import com.redhat.rhn.domain.kickstart.KickstartSession; +import com.redhat.rhn.domain.task.Task; +import com.redhat.rhn.domain.task.TaskFactory; +import com.redhat.rhn.frontend.action.kickstart.test.KickstartTestHelper; +import com.redhat.rhn.manager.satellite.UpgradeCommand; +import com.redhat.rhn.testing.BaseTestCaseWithUser; + +import java.util.List; + + +public class UpgradeCommandTest extends BaseTestCaseWithUser { + + public void testUpgradeProfiles() throws Exception { + KickstartData ksd = KickstartTestHelper.createTestKickStart(user); + + KickstartSession ksession = + KickstartFactory.lookupDefaultKickstartSessionForKickstartData(ksd); + assertNull(ksession); + TaskFactory.createTask(user.getOrg(), + UpgradeCommand.UPGRADE_KS_PROFILES, new Long(0)); + + List l = TaskFactory.getTaskListByNameLike( + UpgradeCommand.UPGRADE_KS_PROFILES); + assertTrue(l.get(0) instanceof Task); + + // UpgradeCommand its its own transaction so we gotta commit. + commitAndCloseSession(); + + UpgradeCommand cmd = new UpgradeCommand(); + cmd.store(); + + // Check to see if the upgrade command created the default profile. + ksession = + KickstartFactory.lookupDefaultKickstartSessionForKickstartData(ksd); + assertNotNull(ksession); + + assertNull(TaskFactory.getTaskListByNameLike( + UpgradeCommand.UPGRADE_KS_PROFILES)); + + } +} diff --git a/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java b/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java index 94a7925..c81ebeb 100644 --- a/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java +++ b/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java @@ -16,6 +16,7 @@ package com.redhat.rhn.webapp;
import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.common.messaging.MessageQueue; +import com.redhat.rhn.manager.satellite.UpgradeCommand;
import org.apache.log4j.LogManager; import org.apache.log4j.Logger; @@ -109,6 +110,17 @@ public class RhnServletListener implements ServletContextListener {
startHibernate(); logStart("Hibernate"); + + log.debug("Starting upgrade check"); + executeUpgradeStep(); + } + + private void executeUpgradeStep() { + log.debug("calling UpgradeCommand."); + UpgradeCommand cmd = new UpgradeCommand(); + cmd.store(); + log.debug("UpgradeCommand done."); + }
/** {@inheritDoc} */
commit 7338082f8e853226f5d42fdfa6aabf2609f99722 Author: John Matthews jmatthew@redhat.com Date: Tue Jul 21 14:01:57 2009 -0400
Automatic commit of package [spacewalk-proxy] release [0.6.8-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index 86d3850..a986f07 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 0.6.7 +Version: 0.6.8 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python @@ -289,6 +289,10 @@ fi
%changelog +* Tue Jul 21 2009 John Matthews jmatthew@redhat.com 0.6.8-1 +- 503187 - rewrite old config during upgrade, old file will be saved as + .rpmorig (msuchy@redhat.com) + * Mon Jul 06 2009 John Matthews jmatthew@redhat.com 0.6.7-1 - 509522 - remove conflicts and put provides to spacewalk-proxy-management (msuchy@redhat.com) diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy index 4ed2eea..d7096c3 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -0.6.7-1 proxy/proxy/ +0.6.8-1 proxy/proxy/
commit 9a6871836be490be02f969b8f2c5d18481c57647 Author: John Matthews jmatthew@redhat.com Date: Tue Jul 21 14:01:22 2009 -0400
Automatic commit of package [spacewalk-backend] release [0.6.21-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 905cb5e..44d7dd6 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 0.6.20 +Version: 0.6.21 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -568,6 +568,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$ %changelog +* Tue Jul 21 2009 John Matthews jmatthew@redhat.com 0.6.21-1 +- 512936 - Changing the custom channel rule to always defalt to org 1 for + custom channels unless --org option is used. This will avoid the confusion of + putting the channel is some random org on slaves. (pkilambi@redhat.com) + * Tue Jul 21 2009 Devan Goodwin dgoodwin@redhat.com 0.6.20-1 - 512960 - check for the proper attr name on rpm for header reading (jbowes@redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 5c729b3..7f82b55 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.20-1 backend/ +0.6.21-1 backend/
commit fe84db417bc4b5a94b7d7f05cbc6f6c5277f4d66 Author: John Matthews jmatthew@redhat.com Date: Tue Jul 21 13:40:03 2009 -0400
Automatic commit of package [spacewalk-koan] release [0.1.17-1].
diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec index 8d97d6e..3ff0d02 100644 --- a/client/tools/spacewalk-koan/spacewalk-koan.spec +++ b/client/tools/spacewalk-koan/spacewalk-koan.spec @@ -3,7 +3,7 @@ Name: spacewalk-koan Group: System Environment/Kernel License: GPLv2 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 0.1.16 +Version: 0.1.17 Release: 1%{?dist} BuildArch : noarch URL: https://fedorahosted.org/spacewalk @@ -49,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/rhn/actions/
%changelog +* Tue Jul 21 2009 John Matthews jmatthew@redhat.com 0.1.17-1 +- 510299 - static ks fix. (paji@redhat.com) +- 510299 - Big commit to get static networking to work (paji@redhat.com) + * Mon Jul 06 2009 John Matthews jmatthew@redhat.com 0.1.16-1 - 508956 - fixing file preservation to actually use updated initrd.img (mmccune@gibson.pdx.redhat.com) diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-koan index c41cff2..9b859c5 100644 --- a/rel-eng/packages/spacewalk-koan +++ b/rel-eng/packages/spacewalk-koan @@ -1 +1 @@ -0.1.16-1 client/tools/spacewalk-koan/ +0.1.17-1 client/tools/spacewalk-koan/
commit b874c7be726bb0a43216de974beb84eec8f2d279 Author: John Matthews jmatthew@redhat.com Date: Tue Jul 21 13:38:41 2009 -0400
Automatic commit of package [rhnsd] release [4.5.11-1].
diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec index 71f28e7..997dced 100644 --- a/client/rhel/rhnsd/rhnsd.spec +++ b/client/rhel/rhnsd/rhnsd.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: %{name}-%{version}.tar.gz Url: http://rhn.redhat.com Name: rhnsd -Version: 4.5.10 +Version: 4.5.11 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +58,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man8/rhnsd.8*
%changelog +* Tue Jul 21 2009 John Matthews jmatthew@redhat.com 4.5.11-1 +- #503719 - fix for postun scriptlet error (pkilambi@redhat.com) + * Tue Jul 7 2009 Pradeep Kilambi pkilambi@redhat.com - Resolves: #503719 - fix for postun scriptlet error
diff --git a/rel-eng/packages/rhnsd b/rel-eng/packages/rhnsd index 9e96a69..db4400d 100644 --- a/rel-eng/packages/rhnsd +++ b/rel-eng/packages/rhnsd @@ -1 +1 @@ -4.5.10-1 client/rhel/rhnsd/ +4.5.11-1 client/rhel/rhnsd/
commit 4b79346074624b419bef590ee17a22029f86b954 Author: Pradeep Kilambi pkilambi@redhat.com Date: Tue Jul 21 13:34:28 2009 -0400
512936 - Changing the custom channel rule to always defalt to org 1 for custom channels unless --org option is used. This will avoid the confusion of putting the channel is some random org on slaves.
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py index bf3cb63..601d131 100644 --- a/backend/satellite_tools/satsync.py +++ b/backend/satellite_tools/satsync.py @@ -65,6 +65,7 @@ import sync_handlers
_DEFAULT_SYSTEMID_PATH = '/etc/sysconfig/rhn/systemid' _DEFAULT_RHN_ENTITLEMENT_CERT_BACKUP = '/etc/sysconfig/rhn/rhn-entitlement-cert.xml' +DEFAULT_ORG = 1
# the option object is used everywhere in this module... make it a # global so we don't have to pass it to everyone. @@ -874,10 +875,9 @@ Please contact your RHN representative""" % (generation, sat_cert.generation)) for t in nvrea_keys: nevra[t] = package[t] or ""
- if OPTIONS.orgid is not None and \ - package['org_id'] is not None: - nevra['org_id'] = OPTIONS.orgid - package['org_id'] = OPTIONS.orgid + if package['org_id'] is not None: + nevra['org_id'] = OPTIONS.orgid or DEFAULT_ORG + package['org_id'] = OPTIONS.orgid or DEFAULT_ORG else: nevra['org_id'] = package['org_id']
@@ -959,8 +959,8 @@ Please contact your RHN representative""" % (generation, sat_cert.generation)) md5sum = package['md5sum'] package_size = package['package_size']
- if OPTIONS.orgid is not None: - orgid = OPTIONS.orgid + if package['org_id'] is not None: + orgid = OPTIONS.orgid or DEFAULT_ORG else: orgid = package['org_id']
@@ -1443,9 +1443,9 @@ Please contact your RHN representative""" % (generation, sat_cert.generation)) for ks, timestamp in missing_kickstarts: ksobj = coll.get_item(ks, timestamp=timestamp) assert ksobj is not None - if OPTIONS.orgid is not None and \ - ksobj['org_id'] is not None: - ksobj['org_id'] = OPTIONS.orgid + + if ksobj['org_id'] is not None: + ksobj['org_id'] = OPTIONS.orgid or DEFAULT_ORG batch.append(ksobj)
importer = sync_handlers.import_kickstarts(batch) @@ -1692,6 +1692,8 @@ Please contact your RHN representative""" % (generation, sat_cert.generation)) uq_packages[pid] = package
uq_pkg_data = uq_packages.values() + # check to make sure the orgs exported are valid + _validate_package_org(uq_pkg_data) try: if OPTIONS.mount_point: importer = sync_handlers.link_channel_packages(uq_pkg_data, strict=0) @@ -1781,9 +1783,8 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
erratum['packages'] = packages
- if OPTIONS.orgid is not None and \ - erratum['org_id'] is not None: - erratum['org_id'] = OPTIONS.orgid + if erratum['org_id'] is not None: + erratum['org_id'] = OPTIONS.orgid or DEFAULT_ORG
# Now fix channels # Associate errata to only channels that are being synced @@ -2030,9 +2031,9 @@ def _validate_package_org(batch): elif orgid: # if options.orgid specified use it pkg['org_id'] = orgid - elif pkg['org_id'] not in orgs: + else: # org from server is not valid - pkg['org_id'] = 1 + pkg['org_id'] = DEFAULT_ORG
def _getImportedChannels(): "Retrieves the channels already imported in the satellite's database" diff --git a/backend/satellite_tools/sync_handlers.py b/backend/satellite_tools/sync_handlers.py index 567f8ee..48645ef 100644 --- a/backend/satellite_tools/sync_handlers.py +++ b/backend/satellite_tools/sync_handlers.py @@ -27,6 +27,8 @@ import xmlSource import syncCache import syncLib
+DEFAULT_ORG = 1 + class NoFreeEntitlementsError(Exception): "No free entitlements available to activate this satellite"
@@ -198,11 +200,9 @@ def import_channels(channels, orgid=None): # finally if the orgs differ so we might wanna use # requested org's channel-family. # TODO: Move these checks somewhere more appropriate - if not orgid and c_obj['org_id'] is not None and \ - c_obj['org_id'] not in orgs: + if not orgid and c_obj['org_id'] is not None: #If the src org is not present default to org 1 - orgid = 1 - + orgid = DEFAULT_ORG if orgid is not None and c_obj['org_id'] is not None and \ c_obj['org_id'] != orgid: #Only set the channel family if its a custom channel @@ -211,6 +211,7 @@ def import_channels(channels, orgid=None): family['label'] = 'private-channel-family-' + \ str(c_obj['org_id'])
+ syncLib.log(1, "Syncing Channel to Org %s " % c_obj['org_id']) batch.append(c_obj)
importer = channelImport.ChannelImport(batch, diskImportLib.get_backend())
commit 8db5db224231ec636c78d08ca974b5f977328693 Author: Devan Goodwin dgoodwin@redhat.com Date: Tue Jul 21 13:29:57 2009 -0300
Automatic commit of package [spacewalk-backend] release [0.6.20-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 8a7f5a4..905cb5e 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 0.6.19 +Version: 0.6.20 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -568,6 +568,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$ %changelog +* Tue Jul 21 2009 Devan Goodwin dgoodwin@redhat.com 0.6.20-1 +- 512960 - check for the proper attr name on rpm for header reading + (jbowes@redhat.com) + * Thu Jul 16 2009 Pradeep Kilambi pkilambi@redhat.com 0.6.19-1 - 512236 - the org id checks were defaulting to None in custom channel cases instead of 1. Also the metadata sting frommaster is a string None so we need diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 3ded2a7..5c729b3 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.19-1 backend/ +0.6.20-1 backend/
commit ef3bece2f536e2ea86456e872f53fa47b18dfc6d Author: James Bowes jbowes@redhat.com Date: Tue Jul 21 11:07:47 2009 -0400
512960 - check for the proper attr name on rpm for header reading
diff --git a/backend/common/rhn_rpm.py b/backend/common/rhn_rpm.py index 3d0efcc..e1b275e 100644 --- a/backend/common/rhn_rpm.py +++ b/backend/common/rhn_rpm.py @@ -268,7 +268,7 @@ def get_package_header(filename=None, file=None, fd=None): if hdr is None: raise InvalidPackageError else: - if hasattr(rpm, 'rpmHeaderFromFD'): + if hasattr(rpm, 'readHeaderFromFD'): header_start, header_end = \ get_header_byte_range(os.fdopen(os.dup(file_desc))) os.lseek(file_desc, header_start, 0)
commit 2ac921f1405577ed1bfa7f8ac2cc2a7ea8d4fefd Author: John Matthews jmatthew@redhat.com Date: Tue Jul 21 11:57:36 2009 -0400
Automatic commit of package [spacewalk-selinux] release [0.6.13-1].
diff --git a/rel-eng/packages/spacewalk-selinux b/rel-eng/packages/spacewalk-selinux index 7492603..322ef83 100644 --- a/rel-eng/packages/spacewalk-selinux +++ b/rel-eng/packages/spacewalk-selinux @@ -1 +1 @@ -0.6.12-1 selinux/spacewalk-selinux/ +0.6.13-1 selinux/spacewalk-selinux/ diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spacewalk-selinux/spacewalk-selinux.spec index 3673275..7ce33b0 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux.spec +++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec @@ -7,7 +7,7 @@ %define modulename spacewalk
Name: spacewalk-selinux -Version: 0.6.12 +Version: 0.6.13 Release: 1%{?dist} Summary: SELinux policy module supporting Spacewalk Server
@@ -115,6 +115,10 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog +* Tue Jul 21 2009 John Matthews jmatthew@redhat.com 0.6.13-1 +- Disabling requires on spacewalk-monitoring-selinux. (temporary) + (dgoodwin@redhat.com) + * Thu Jul 2 2009 Miroslav Suchy msuchy@redhat.com 0.6.12-1 - 509369 - run restorecon for /var/www/html/pub since its content is not owned by any package
commit 24d279e5b44186f695f9471065b05e3a3f7230d3 Author: John Matthews jmatthew@redhat.com Date: Tue Jul 21 11:47:11 2009 -0400
Automatic commit of package [spacewalk-branding] release [0.6.8-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index eb017b7..aade6ce 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -1,5 +1,5 @@ Name: spacewalk-branding -Version: 0.6.7 +Version: 0.6.8 Release: 1%{?dist} Summary: Spacewalk branding data
@@ -68,6 +68,10 @@ rm -rf %{buildroot}
%changelog +* Tue Jul 21 2009 John Matthews jmatthew@redhat.com 0.6.8-1 +- 510146 - Update copyright years from 2002-08 to 2002-09. + (dgoodwin@redhat.com) + * Tue Jun 30 2009 Miroslav Suchy msuchy@redhat.com 0.6.7-1 - 508710 - make bar on top of page wider, so we do not get empty space on wider displays
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index 660ed0e..105a0b1 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -0.6.7-1 branding/ +0.6.8-1 branding/
commit f40dbc02e1d7dfefcf2063f516e0fbf70b4bdc64 Author: John Matthews jmatthew@redhat.com Date: Tue Jul 21 11:39:21 2009 -0400
Automatic commit of package [spacewalk-config] release [0.6.9-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config index e483978..5b41879 100644 --- a/rel-eng/packages/spacewalk-config +++ b/rel-eng/packages/spacewalk-config @@ -1 +1 @@ -0.6.8-1 spacewalk/config/ +0.6.9-1 spacewalk/config/ diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec index d40cbd6..5e34453 100644 --- a/spacewalk/config/spacewalk-config.spec +++ b/spacewalk/config/spacewalk-config.spec @@ -2,7 +2,7 @@
Name: spacewalk-config Summary: Spacewalk Configuration -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} URL: http://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -114,6 +114,10 @@ fi
%changelog +* Tue Jul 21 2009 John Matthews jmatthew@redhat.com 0.6.9-1 +- adding disable_iss flag to rhn.conf (pkilambi@redhat.com) +- 511100 - Fixed upgrade scripts to include cobbler.host (paji@redhat.com) + * Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.8-1 - Fix mod_jk failure to load. (dgoodwin@redhat.com)
commit c551802f548df261f47ee81dc273e4bcc1260cc5 Author: Miroslav Suchý msuchy@redhat.com Date: Tue Jul 21 17:30:26 2009 +0200
Automatic commit of package [spacewalk-web] release [0.6.13-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 2db4d0d..c744c02 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -0.6.12-1 web/ +0.6.13-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index a5b5842..2650f72 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.12 +Version: 0.6.13 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -317,7 +317,7 @@ rm -rf $RPM_BUILD_ROOT
# $Id$ %changelog -* Tue Jul 21 2009 Miroslav Suchy msuchy@redhat.com 0.6.12-1 +* Tue Jul 21 2009 Miroslav Suchy msuchy@redhat.com 0.6.13-1 - 512440 - add cobbler-proxy.conf to older rhn proxy installer
* Thu Jul 09 2009 John Matthews jmatthew@redhat.com 0.6.11-1
commit 4e8f17f62810935d77e70707ade57dcf4732891f Author: Miroslav Suchý msuchy@redhat.com Date: Tue Jul 21 17:29:01 2009 +0200
512440 - load cobbler-proxy.conf in httpd.conf and load proxy module
diff --git a/web/html/applications/rhn-proxy/4.0/httpd/httpd.conf b/web/html/applications/rhn-proxy/4.0/httpd/httpd.conf index a065c7c..7cc80a1 100644 --- a/web/html/applications/rhn-proxy/4.0/httpd/httpd.conf +++ b/web/html/applications/rhn-proxy/4.0/httpd/httpd.conf @@ -240,7 +240,7 @@ LoadModule anon_auth_module modules/mod_auth_anon.so #LoadModule mysql_auth_module modules/mod_auth_mysql.so #LoadModule auth_pgsql_module modules/mod_auth_pgsql.so #LoadModule digest_module modules/mod_digest.so -#LoadModule proxy_module modules/libproxy.so +LoadModule proxy_module modules/libproxy.so #LoadModule cern_meta_module modules/mod_cern_meta.so LoadModule expires_module modules/mod_expires.so LoadModule headers_module modules/mod_headers.so @@ -318,7 +318,7 @@ AddModule mod_auth_anon.c #AddModule mod_auth_mysql.c #AddModule mod_auth_pgsql.c #AddModule mod_digest.c -#AddModule mod_proxy.c +AddModule mod_proxy.c #AddModule mod_cern_meta.c AddModule mod_expires.c AddModule mod_headers.c @@ -1459,3 +1459,4 @@ CustomLog logs/ssl_request_log \ </IfDefine>
Include conf/rhn_proxy.conf +Include conf/cobbler-proxy.conf diff --git a/web/html/applications/rhn-proxy/4.1/httpd/httpd.conf b/web/html/applications/rhn-proxy/4.1/httpd/httpd.conf index a065c7c..7cc80a1 100644 --- a/web/html/applications/rhn-proxy/4.1/httpd/httpd.conf +++ b/web/html/applications/rhn-proxy/4.1/httpd/httpd.conf @@ -240,7 +240,7 @@ LoadModule anon_auth_module modules/mod_auth_anon.so #LoadModule mysql_auth_module modules/mod_auth_mysql.so #LoadModule auth_pgsql_module modules/mod_auth_pgsql.so #LoadModule digest_module modules/mod_digest.so -#LoadModule proxy_module modules/libproxy.so +LoadModule proxy_module modules/libproxy.so #LoadModule cern_meta_module modules/mod_cern_meta.so LoadModule expires_module modules/mod_expires.so LoadModule headers_module modules/mod_headers.so @@ -318,7 +318,7 @@ AddModule mod_auth_anon.c #AddModule mod_auth_mysql.c #AddModule mod_auth_pgsql.c #AddModule mod_digest.c -#AddModule mod_proxy.c +AddModule mod_proxy.c #AddModule mod_cern_meta.c AddModule mod_expires.c AddModule mod_headers.c @@ -1459,3 +1459,4 @@ CustomLog logs/ssl_request_log \ </IfDefine>
Include conf/rhn_proxy.conf +Include conf/cobbler-proxy.conf diff --git a/web/html/applications/rhn-proxy/4.2/httpd/httpd.conf b/web/html/applications/rhn-proxy/4.2/httpd/httpd.conf index a065c7c..7cc80a1 100644 --- a/web/html/applications/rhn-proxy/4.2/httpd/httpd.conf +++ b/web/html/applications/rhn-proxy/4.2/httpd/httpd.conf @@ -240,7 +240,7 @@ LoadModule anon_auth_module modules/mod_auth_anon.so #LoadModule mysql_auth_module modules/mod_auth_mysql.so #LoadModule auth_pgsql_module modules/mod_auth_pgsql.so #LoadModule digest_module modules/mod_digest.so -#LoadModule proxy_module modules/libproxy.so +LoadModule proxy_module modules/libproxy.so #LoadModule cern_meta_module modules/mod_cern_meta.so LoadModule expires_module modules/mod_expires.so LoadModule headers_module modules/mod_headers.so @@ -318,7 +318,7 @@ AddModule mod_auth_anon.c #AddModule mod_auth_mysql.c #AddModule mod_auth_pgsql.c #AddModule mod_digest.c -#AddModule mod_proxy.c +AddModule mod_proxy.c #AddModule mod_cern_meta.c AddModule mod_expires.c AddModule mod_headers.c @@ -1459,3 +1459,4 @@ CustomLog logs/ssl_request_log \ </IfDefine>
Include conf/rhn_proxy.conf +Include conf/cobbler-proxy.conf diff --git a/web/html/applications/rhn-proxy/5.0/httpd/httpd.conf b/web/html/applications/rhn-proxy/5.0/httpd/httpd.conf index a065c7c..7cc80a1 100644 --- a/web/html/applications/rhn-proxy/5.0/httpd/httpd.conf +++ b/web/html/applications/rhn-proxy/5.0/httpd/httpd.conf @@ -240,7 +240,7 @@ LoadModule anon_auth_module modules/mod_auth_anon.so #LoadModule mysql_auth_module modules/mod_auth_mysql.so #LoadModule auth_pgsql_module modules/mod_auth_pgsql.so #LoadModule digest_module modules/mod_digest.so -#LoadModule proxy_module modules/libproxy.so +LoadModule proxy_module modules/libproxy.so #LoadModule cern_meta_module modules/mod_cern_meta.so LoadModule expires_module modules/mod_expires.so LoadModule headers_module modules/mod_headers.so @@ -318,7 +318,7 @@ AddModule mod_auth_anon.c #AddModule mod_auth_mysql.c #AddModule mod_auth_pgsql.c #AddModule mod_digest.c -#AddModule mod_proxy.c +AddModule mod_proxy.c #AddModule mod_cern_meta.c AddModule mod_expires.c AddModule mod_headers.c @@ -1459,3 +1459,4 @@ CustomLog logs/ssl_request_log \ </IfDefine>
Include conf/rhn_proxy.conf +Include conf/cobbler-proxy.conf
commit 71858e2aecce64910ee25a348ebe2d20dea3c989 Author: John Matthews jmatthew@redhat.com Date: Tue Jul 21 11:14:48 2009 -0400
Automatic commit of package [spacewalk-java] release [0.6.33-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 8d41d86..933a515 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -12,7 +12,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.32 +Version: 0.6.33 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -250,6 +250,38 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
%changelog +* Tue Jul 21 2009 John Matthews jmatthew@redhat.com 0.6.33-1 +- 512679 - Fix to guess a sensible default virt path for Xen/KVM virt type + (paji@redhat.com) +- 510785 - Removed the 'valid' column from the ks profiles list + (paji@redhat.com) +- 512396 - Cobbler's KS meta can store ints while our code was expecting them + to be all strings (paji@redhat.com) +- Fixed unit tests (paji@redhat.com) +- 510785 - Handled an edge case where there are NO valid trees available in KS + raw mode.. (paji@redhat.com) +- 510785 - Major commit to deal with KS/Distro upgrade scenarios + (paji@redhat.com) +- 509409 - rewrote package file naming when pushed from proxy + (shughes@redhat.com) +- 510785 - modifying query to now show profiles on provisioning schedule pages + if the profiles cobbler id is null (jsherril@redhat.com) +- 512224 - improving handling of invalid network interfaces when adding them to + cobbler (jsherril@redhat.com) +- 510785 - updating cobbler sync tasks to ignore kickstarts and trees when the + tree is not able to be synced to cobbler (jsherril@redhat.com) +- 511963 - fixing issue where changing distro from non-para virt to paravirt + would not update cobbler objects correctly (or vice-versa) + (jsherril@redhat.com) +- 510785 - Initial stab on the Invalid KS Distro Base Path issue. + (paji@redhat.com) +- 508331 - sha256 checksum support for yum repo generation stuff through + taskomatic. (pkilambi@redhat.com) +- 510329 - Fix SSM package operations UI timeout. (dgoodwin@redhat.com) +- 509589 - fix for org counts (shughes@redhat.com) +- 510299 - Big commit to get static networking to work (paji@redhat.com) +- 509409 - correct package display for rhn_package_manager (shughes@redhat.com) + * Thu Jul 09 2009 John Matthews jmatthew@redhat.com 0.6.32-1 - 510122 - ErrataSearch now filters results so it won't display errata from a non-sharing Org (jmatthew@redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 440fb75..31f2495 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.32-1 java/ +0.6.33-1 java/
commit bacd7ecb9e0c10b315f3f097279528aa9ce7bf62 Author: John Matthews jmatthew@redhat.com Date: Tue Jul 21 11:11:54 2009 -0400
Automatic commit of package [spacewalk-setup] release [0.6.10-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index 87a7464..85d7245 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -0.6.9-1 spacewalk/setup/ +0.6.10-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index a7cf6c2..8bb58cd 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup -Version: 0.6.9 +Version: 0.6.10 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk
@@ -100,6 +100,11 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/pki/spacewalk/jabberd
%changelog +* Tue Jul 21 2009 John Matthews jmatthew@redhat.com 0.6.10-1 +- rhn-load-config.pl - remove accidental 's' (bbuckingham@redhat.com) +- 511100 - Fixed upgrade scripts to include cobbler.host (paji@redhat.com) +- 511052 - script to fix rhn_sat_node, rhn_sat_cluster (mzazrivec@redhat.com) + * Thu Jun 25 2009 Milan Zazrivec mzazrivec@redhat.com 0.6.9-1 - no in-place editing of /etc/oratab under oracle user (mzazrivec@redhat.com) - remove extraneous backslash characters (mzazrivec@redhat.com)
commit 9ce80f1cdeed1f08b85f53d5a27dd189dce0ce55 Author: Miroslav Suchý msuchy@redhat.com Date: Tue Jul 21 16:30:06 2009 +0200
Automatic commit of package [spacewalk-web] release [0.6.12-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index d33060f..2db4d0d 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -0.6.11-1 web/ +0.6.12-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 9de9163..a5b5842 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.11 +Version: 0.6.12 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -317,6 +317,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$ %changelog +* Tue Jul 21 2009 Miroslav Suchy msuchy@redhat.com 0.6.12-1 +- 512440 - add cobbler-proxy.conf to older rhn proxy installer + * Thu Jul 09 2009 John Matthews jmatthew@redhat.com 0.6.11-1 - 510146 - Update copyright years from 2002-08 to 2002-09. (dgoodwin@redhat.com)
commit 5d183fb9f770eed516b21bc9841e71ebb6bcacaf Author: Miroslav Suchý msuchy@redhat.com Date: Tue Jul 21 16:26:37 2009 +0200
512440 - add cobbler-proxy.conf to 5.1, 5.0, 4.2, 4.1, 4.0 rhn proxy installer
diff --git a/web/html/applications/rhn-proxy/4.0/httpd/cobbler-proxy.conf b/web/html/applications/rhn-proxy/4.0/httpd/cobbler-proxy.conf new file mode 100644 index 0000000..79fb06d --- /dev/null +++ b/web/html/applications/rhn-proxy/4.0/httpd/cobbler-proxy.conf @@ -0,0 +1,9 @@ +ProxyPass /cobbler_api https://$%7Bsession.rhn_parent%7D/cobbler_api +ProxyPassReverse /cobbler_api https://$%7Bsession.rhn_parent%7D/cobbler_api + +ProxyPass /cblr https://$%7Bsession.rhn_parent%7D/cblr +ProxyPassReverse /cblr https://$%7Bsession.rhn_parent%7D/cblr + +ProxyPass /cobbler https://$%7Bsession.rhn_parent%7D/cobbler +ProxyPassReverse /cobbler https://$%7Bsession.rhn_parent%7D/cobbler + diff --git a/web/html/applications/rhn-proxy/4.0/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/4.0/install-rhn-proxy.xml index 5f405b9..a0e0b20 100644 --- a/web/html/applications/rhn-proxy/4.0/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/4.0/install-rhn-proxy.xml @@ -535,6 +535,11 @@ Would you like to enable Monitoring Proxy functionality on this system? template="httpd/rhn_proxy.conf" mode="640" username="root" groupname="apache"/> </activity>
+ <activity description="Generate /etc/httpd/conf/cobbler-proxy.conf config file"> + <generate-config-file target-config-channel="rhn_proxy_config_${system.id}" path="/etc/httpd/conf/cobbler-proxy.conf" + template="httpd/cobbler-proxy.conf" mode="640" username="root" groupname="apache"/> + </activity> + <activity description="Generate /etc/jabberd/c2s.xml config file" acl="global_config(ssl_available);session_data_true(enable_osad)"> <generate-config-file target-config-channel="rhn_proxy_config_${system.id}" path="/etc/jabberd/c2s.xml" @@ -589,6 +594,7 @@ fi <configfile>/etc/squid/squid.conf</configfile> <configfile>/etc/httpd/conf/httpd.conf</configfile> <configfile>/etc/httpd/conf/rhn_proxy.conf</configfile> + <configfile>/etc/httpd/conf/cobbler-proxy.conf</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.crt/server.crt</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.csr/server.csr</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.key/server.key</configfile> diff --git a/web/html/applications/rhn-proxy/4.1/httpd/cobbler-proxy.conf b/web/html/applications/rhn-proxy/4.1/httpd/cobbler-proxy.conf new file mode 100644 index 0000000..79fb06d --- /dev/null +++ b/web/html/applications/rhn-proxy/4.1/httpd/cobbler-proxy.conf @@ -0,0 +1,9 @@ +ProxyPass /cobbler_api https://$%7Bsession.rhn_parent%7D/cobbler_api +ProxyPassReverse /cobbler_api https://$%7Bsession.rhn_parent%7D/cobbler_api + +ProxyPass /cblr https://$%7Bsession.rhn_parent%7D/cblr +ProxyPassReverse /cblr https://$%7Bsession.rhn_parent%7D/cblr + +ProxyPass /cobbler https://$%7Bsession.rhn_parent%7D/cobbler +ProxyPassReverse /cobbler https://$%7Bsession.rhn_parent%7D/cobbler + diff --git a/web/html/applications/rhn-proxy/4.1/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/4.1/install-rhn-proxy.xml index aa918fd..e89333f 100644 --- a/web/html/applications/rhn-proxy/4.1/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/4.1/install-rhn-proxy.xml @@ -535,6 +535,11 @@ Would you like to enable Monitoring Proxy functionality on this system? template="httpd/rhn_proxy.conf" mode="640" username="root" groupname="apache"/> </activity>
+ <activity description="Generate /etc/httpd/conf/cobbler-proxy.conf config file"> + <generate-config-file target-config-channel="rhn_proxy_config_${system.id}" path="/etc/httpd/conf/cobbler-proxy.conf" + template="httpd/cobbler-proxy.conf" mode="640" username="root" groupname="apache"/> + </activity> + <activity description="Generate /etc/jabberd/c2s.xml config file" acl="global_config(ssl_available);session_data_true(enable_osad)"> <generate-config-file target-config-channel="rhn_proxy_config_${system.id}" path="/etc/jabberd/c2s.xml" @@ -589,6 +594,7 @@ fi <configfile>/etc/squid/squid.conf</configfile> <configfile>/etc/httpd/conf/httpd.conf</configfile> <configfile>/etc/httpd/conf/rhn_proxy.conf</configfile> + <configfile>/etc/httpd/conf/cobbler-proxy.conf</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.crt/server.crt</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.csr/server.csr</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.key/server.key</configfile> diff --git a/web/html/applications/rhn-proxy/4.2/httpd/cobbler-proxy.conf b/web/html/applications/rhn-proxy/4.2/httpd/cobbler-proxy.conf new file mode 100644 index 0000000..79fb06d --- /dev/null +++ b/web/html/applications/rhn-proxy/4.2/httpd/cobbler-proxy.conf @@ -0,0 +1,9 @@ +ProxyPass /cobbler_api https://$%7Bsession.rhn_parent%7D/cobbler_api +ProxyPassReverse /cobbler_api https://$%7Bsession.rhn_parent%7D/cobbler_api + +ProxyPass /cblr https://$%7Bsession.rhn_parent%7D/cblr +ProxyPassReverse /cblr https://$%7Bsession.rhn_parent%7D/cblr + +ProxyPass /cobbler https://$%7Bsession.rhn_parent%7D/cobbler +ProxyPassReverse /cobbler https://$%7Bsession.rhn_parent%7D/cobbler + diff --git a/web/html/applications/rhn-proxy/4.2/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/4.2/install-rhn-proxy.xml index 66ded03..7b0c91e 100644 --- a/web/html/applications/rhn-proxy/4.2/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/4.2/install-rhn-proxy.xml @@ -552,6 +552,11 @@ Would you like to enable Monitoring Proxy functionality on this system? template="httpd/rhn_proxy.conf" mode="640" username="root" groupname="apache"/> </activity>
+ <activity description="Generate /etc/httpd/conf/cobbler-proxy.conf config file"> + <generate-config-file target-config-channel="rhn_proxy_config_${system.id}" path="/etc/httpd/conf/cobbler-proxy.conf" + template="httpd/cobbler-proxy.conf" mode="640" username="root" groupname="apache"/> + </activity> + <activity description="Generate /etc/jabberd/c2s.xml config file" acl="global_config(ssl_available);session_data_true(enable_osad)"> <generate-config-file target-config-channel="rhn_proxy_config_${system.id}" path="/etc/jabberd/c2s.xml" @@ -606,6 +611,7 @@ fi <configfile>/etc/squid/squid.conf</configfile> <configfile>/etc/httpd/conf/httpd.conf</configfile> <configfile>/etc/httpd/conf/rhn_proxy.conf</configfile> + <configfile>/etc/httpd/conf/cobbler-proxy.conf</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.crt/server.crt</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.csr/server.csr</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.key/server.key</configfile> diff --git a/web/html/applications/rhn-proxy/5.0/httpd/cobbler-proxy.conf b/web/html/applications/rhn-proxy/5.0/httpd/cobbler-proxy.conf new file mode 100644 index 0000000..79fb06d --- /dev/null +++ b/web/html/applications/rhn-proxy/5.0/httpd/cobbler-proxy.conf @@ -0,0 +1,9 @@ +ProxyPass /cobbler_api https://$%7Bsession.rhn_parent%7D/cobbler_api +ProxyPassReverse /cobbler_api https://$%7Bsession.rhn_parent%7D/cobbler_api + +ProxyPass /cblr https://$%7Bsession.rhn_parent%7D/cblr +ProxyPassReverse /cblr https://$%7Bsession.rhn_parent%7D/cblr + +ProxyPass /cobbler https://$%7Bsession.rhn_parent%7D/cobbler +ProxyPassReverse /cobbler https://$%7Bsession.rhn_parent%7D/cobbler + diff --git a/web/html/applications/rhn-proxy/5.0/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/5.0/install-rhn-proxy.xml index cec006a..a3e2e45 100644 --- a/web/html/applications/rhn-proxy/5.0/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/5.0/install-rhn-proxy.xml @@ -552,6 +552,11 @@ Would you like to enable Monitoring Proxy functionality on this system? template="httpd/rhn_proxy.conf" mode="640" username="root" groupname="apache"/> </activity>
+ <activity description="Generate /etc/httpd/conf/cobbler-proxy.conf config file"> + <generate-config-file target-config-channel="rhn_proxy_config_${system.id}" path="/etc/httpd/conf/cobbler-proxy.conf" + template="httpd/cobbler-proxy.conf" mode="640" username="root" groupname="apache"/> + </activity> + <activity description="Generate /etc/jabberd/c2s.xml config file" acl="global_config(ssl_available);session_data_true(enable_osad)"> <generate-config-file target-config-channel="rhn_proxy_config_${system.id}" path="/etc/jabberd/c2s.xml" @@ -606,6 +611,7 @@ fi <configfile>/etc/squid/squid.conf</configfile> <configfile>/etc/httpd/conf/httpd.conf</configfile> <configfile>/etc/httpd/conf/rhn_proxy.conf</configfile> + <configfile>/etc/httpd/conf/cobbler-proxy.conf</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.crt/server.crt</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.csr/server.csr</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.key/server.key</configfile> diff --git a/web/html/applications/rhn-proxy/5.1/httpd/cobbler-proxy.conf b/web/html/applications/rhn-proxy/5.1/httpd/cobbler-proxy.conf new file mode 100644 index 0000000..79fb06d --- /dev/null +++ b/web/html/applications/rhn-proxy/5.1/httpd/cobbler-proxy.conf @@ -0,0 +1,9 @@ +ProxyPass /cobbler_api https://$%7Bsession.rhn_parent%7D/cobbler_api +ProxyPassReverse /cobbler_api https://$%7Bsession.rhn_parent%7D/cobbler_api + +ProxyPass /cblr https://$%7Bsession.rhn_parent%7D/cblr +ProxyPassReverse /cblr https://$%7Bsession.rhn_parent%7D/cblr + +ProxyPass /cobbler https://$%7Bsession.rhn_parent%7D/cobbler +ProxyPassReverse /cobbler https://$%7Bsession.rhn_parent%7D/cobbler + diff --git a/web/html/applications/rhn-proxy/5.1/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/5.1/install-rhn-proxy.xml index f1ab7ac..69d8bb3 100644 --- a/web/html/applications/rhn-proxy/5.1/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/5.1/install-rhn-proxy.xml @@ -547,6 +547,11 @@ Would you like to enable Monitoring Proxy functionality on this system? template="httpd/rhn_proxy.conf" mode="640" username="root" groupname="apache"/> </activity>
+ <activity description="Generate /etc/httpd/conf.d/cobbler-proxy.conf config file"> + <generate-config-file target-config-channel="rhn_proxy_config_${system.id}" path="/etc/httpd/conf.d/cobbler-proxy.conf" + template="httpd/cobbler-proxy.conf" mode="640" username="root" groupname="apache"/> + </activity> + <activity description="Generate /etc/jabberd/c2s.xml config file" acl="global_config(ssl_available);session_data_true(enable_osad)"> <generate-config-file target-config-channel="rhn_proxy_config_${system.id}" path="/etc/jabberd/c2s.xml" @@ -599,6 +604,7 @@ fi <configfile>/etc/rhn/rhn.conf</configfile> <configfile acl="session_data_true(enable_monitoring)">/etc/rhn/cluster.ini</configfile> <configfile>/etc/squid/squid.conf</configfile> + <configfile>/etc/httpd/conf.d/cobbler-proxy.conf</configfile> <configfile>/etc/httpd/conf.d/rhn_proxy.conf</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.crt/server.crt</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.csr/server.csr</configfile>
commit b24912a165aaa6537fdff63c2776a2424039a766 Author: Miroslav Suchý msuchy@redhat.com Date: Tue Jul 21 15:26:36 2009 +0200
512440 - add cobbler-proxy.conf to 5.2 rhn proxy installer
diff --git a/web/html/applications/rhn-proxy/5.2/httpd/cobbler-proxy.conf b/web/html/applications/rhn-proxy/5.2/httpd/cobbler-proxy.conf new file mode 100644 index 0000000..79fb06d --- /dev/null +++ b/web/html/applications/rhn-proxy/5.2/httpd/cobbler-proxy.conf @@ -0,0 +1,9 @@ +ProxyPass /cobbler_api https://$%7Bsession.rhn_parent%7D/cobbler_api +ProxyPassReverse /cobbler_api https://$%7Bsession.rhn_parent%7D/cobbler_api + +ProxyPass /cblr https://$%7Bsession.rhn_parent%7D/cblr +ProxyPassReverse /cblr https://$%7Bsession.rhn_parent%7D/cblr + +ProxyPass /cobbler https://$%7Bsession.rhn_parent%7D/cobbler +ProxyPassReverse /cobbler https://$%7Bsession.rhn_parent%7D/cobbler + diff --git a/web/html/applications/rhn-proxy/5.2/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/5.2/install-rhn-proxy.xml index 3bec25b..d5cd402 100644 --- a/web/html/applications/rhn-proxy/5.2/install-rhn-proxy.xml +++ b/web/html/applications/rhn-proxy/5.2/install-rhn-proxy.xml @@ -547,6 +547,11 @@ Would you like to enable Monitoring Proxy functionality on this system? template="httpd/rhn_proxy.conf" mode="640" username="root" groupname="apache"/> </activity>
+ <activity description="Generate /etc/httpd/conf.d/cobbler-proxy.conf config file"> + <generate-config-file target-config-channel="rhn_proxy_config_${system.id}" path="/etc/httpd/conf.d/cobbler-proxy.conf" + template="httpd/cobbler-proxy.conf" mode="640" username="root" groupname="apache"/> + </activity> + <activity description="Generate /etc/httpd/conf.d/ssl.conf config file"> <generate-config-file target-config-channel="rhn_proxy_config_${system.id}" path="/etc/httpd/conf.d/ssl.conf" template="httpd/ssl.conf" mode="644" username="root" groupname="root"/> @@ -605,6 +610,7 @@ fi <configfile acl="session_data_true(enable_monitoring)">/etc/rhn/cluster.ini</configfile> <configfile>/etc/squid/squid.conf</configfile> <configfile>/etc/httpd/conf.d/rhn_proxy.conf</configfile> + <configfile>/etc/httpd/conf.d/cobbler-proxy.conf</configfile> <configfile>/etc/httpd/conf.d/ssl.conf</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.crt/server.crt</configfile> <configfile acl="global_config(ssl_available) or not global_config(satellite)">/etc/httpd/conf/ssl.csr/server.csr</configfile>
commit 7f7c675c5c0c47d7a3315b73ad5b095be5c7e097 Author: Devan Goodwin dgoodwin@redhat.com Date: Tue Jul 21 10:36:06 2009 -0300
Remove accidentally committed change.
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spacewalk-selinux/spacewalk-selinux.spec index 3772b0a..3673275 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux.spec +++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec @@ -39,7 +39,6 @@ Requires: spacewalk-backend-server Requires: spacewalk-certs-tools Requires: oracle-instantclient-selinux Requires: oracle-instantclient-sqlplus-selinux -Requires: spacewalk-monitoring-selinux
%description SELinux policy module supporting Spacewalk Server.
commit 222c4ff455f864e0e7536385c621d0bab68b3037 Author: Devan Goodwin dgoodwin@redhat.com Date: Tue Jul 21 10:35:20 2009 -0300
Automatic commit of package [spacewalk-monitoring] release [0.6.6-1].
diff --git a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec index fff174b..fed7e34 100644 --- a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec +++ b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec @@ -14,7 +14,7 @@ Summary: Spacewalk monitoring Name: spacewalk-monitoring Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 0.6.5 +Version: 0.6.6 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk License: GPLv2 @@ -123,7 +123,7 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE
%changelog -* Tue Jul 21 2009 Devan Goodwin dgoodwin@redhat.com 0.6.5-1 +* Tue Jul 21 2009 Devan Goodwin dgoodwin@redhat.com 0.6.6-1 - Disabling requires on spacewalk-monitoring-selinux. (temporary) (dgoodwin@redhat.com)
diff --git a/rel-eng/packages/spacewalk-monitoring b/rel-eng/packages/spacewalk-monitoring index a77d490..d414f1c 100644 --- a/rel-eng/packages/spacewalk-monitoring +++ b/rel-eng/packages/spacewalk-monitoring @@ -1 +1 @@ -0.6.5-1 monitoring/spacewalk-monitoring/ +0.6.6-1 monitoring/spacewalk-monitoring/
commit 582b37a212858fbdd02a86e30087ace3bec52229 Author: Devan Goodwin dgoodwin@redhat.com Date: Tue Jul 21 10:32:33 2009 -0300
No requires for monitoring selinux package on Fedora 11. (yet)
diff --git a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec index 8a4ffc0..fff174b 100644 --- a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec +++ b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec @@ -1,3 +1,16 @@ +%define require_selinux 1 + +# No Selinux for RHEL 4: +%if 0%{?rhel} == 4 +%define require_selinux 0 +%endif + +# No seliux for Fedora 11 (yet): +%if 0%{?fedora} == 11 +%define require_selinux 0 +%endif + + Summary: Spacewalk monitoring Name: spacewalk-monitoring Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -47,11 +60,10 @@ Requires: SputLite-server Requires: ssl_bridge Requires: status_log_acceptor Requires: tsdb -#%if 0%{?rhel} == 4 -#for rhel4 we have no selinux policy, everything else should have -#%else -#Requires: spacewalk-monitoring-selinux -#%endif + +%if %{require_selinux} +Requires: spacewalk-monitoring-selinux +%endif
Requires(post): chkconfig Requires(preun): chkconfig
commit fbe41f868a3d731d8a0abd343ff0873b53aec2b9 Author: Devan Goodwin dgoodwin@redhat.com Date: Tue Jul 21 09:57:54 2009 -0300
Automatic commit of package [spacewalk-monitoring] release [0.6.5-1].
diff --git a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec index df71450..8a4ffc0 100644 --- a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec +++ b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec @@ -1,7 +1,7 @@ Summary: Spacewalk monitoring Name: spacewalk-monitoring Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 0.6.4 +Version: 0.6.5 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk License: GPLv2 @@ -111,6 +111,10 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE
%changelog +* Tue Jul 21 2009 Devan Goodwin dgoodwin@redhat.com 0.6.5-1 +- Disabling requires on spacewalk-monitoring-selinux. (temporary) + (dgoodwin@redhat.com) + * Mon May 11 2009 Jan Pazdziora 0.6.4-1 - Move Req of oracle-instantclient-selinux to spacewalk-monitoring-selinux
diff --git a/rel-eng/packages/spacewalk-monitoring b/rel-eng/packages/spacewalk-monitoring index fa4a675..a77d490 100644 --- a/rel-eng/packages/spacewalk-monitoring +++ b/rel-eng/packages/spacewalk-monitoring @@ -1 +1 @@ -0.6.4-1 monitoring/spacewalk-monitoring/ +0.6.5-1 monitoring/spacewalk-monitoring/
commit db366bb19df902e4a207b4331aec455e58edad48 Author: Devan Goodwin dgoodwin@redhat.com Date: Tue Jul 21 09:56:09 2009 -0300
Disabling requires on spacewalk-monitoring-selinux. (temporary)
diff --git a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec index 29c2d47..df71450 100644 --- a/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec +++ b/monitoring/spacewalk-monitoring/spacewalk-monitoring.spec @@ -47,11 +47,11 @@ Requires: SputLite-server Requires: ssl_bridge Requires: status_log_acceptor Requires: tsdb -%if 0%{?rhel} == 4 +#%if 0%{?rhel} == 4 #for rhel4 we have no selinux policy, everything else should have -%else -Requires: spacewalk-monitoring-selinux -%endif +#%else +#Requires: spacewalk-monitoring-selinux +#%endif
Requires(post): chkconfig Requires(preun): chkconfig diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spacewalk-selinux/spacewalk-selinux.spec index 3673275..3772b0a 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux.spec +++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec @@ -39,6 +39,7 @@ Requires: spacewalk-backend-server Requires: spacewalk-certs-tools Requires: oracle-instantclient-selinux Requires: oracle-instantclient-sqlplus-selinux +Requires: spacewalk-monitoring-selinux
%description SELinux policy module supporting Spacewalk Server.
commit d7951318895277bc197a9b14b8c0e03664c1bf69 Author: Milan Zazrivec mzazrivec@redhat.com Date: Tue Jul 21 14:05:29 2009 +0200
don't remove xml-commons-apis during upgrade
diff --git a/satellite/install/install.pl b/satellite/install/install.pl index f91f7dc..18b4d41 100755 --- a/satellite/install/install.pl +++ b/satellite/install/install.pl @@ -534,7 +534,7 @@ sub remove_obsoleted_packages { print "* Purging conflicting packages.\n"; my @pkgs = ('rhn-apache', 'rhn-modpython', 'rhn-modssl', 'rhn-modperl', 'perl-libapreq', 'bouncycastle-jdk1.4', - 'xml-commons-apis', 'quartz-oracle', 'jaf', 'jta'); + 'quartz-oracle', 'jaf', 'jta'); for my $pkg (@pkgs) { if (system_debug('rpm', '-q', $pkg) == 0) { system_debug('rpm', '-ev', '--nodeps', $pkg);
commit 692ae7d04a17cfe598557ae732e3ca42535c7d5f Author: Partha Aji paji@redhat.com Date: Mon Jul 20 16:54:47 2009 -0400
512679 - Fix to guess a sensible default virt path for Xen/KVM virt type
diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java index 895a0c1..d1e5065 100644 --- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java +++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java @@ -135,8 +135,10 @@ public class ConfigDefaults { public static final String COBBLER_SNIPPETS_DIR = "cobbler.snippets.dir"; private static final String DEFAULT_COBBLER_SNIPPET_DIR = "/var/lib/cobbler/snippets";
- public static final String VIRT_PATH_DIR = "kickstart.virt_storage_path"; - private static final String DEFAULT_VIRT_PATH = "/var/lib/libvirt/images"; + public static final String KVM_VIRT_PATH_DIR = "kickstart.virt_storage_path_kvm"; + public static final String XEN_VIRT_PATH_DIR = "kickstart.virt_storage_path_xen"; + private static final String DEFAULT_XEN_VIRT_PATH = "/var/lib/xen/images"; + private static final String DEFAULT_KVM_VIRT_PATH = "/var/lib/libvirt/images"; public static final String VIRT_BRIDGE = "kickstart.virt_bridge"; public static final String VIRT_MEM = "kickstart.virt_mem_size_mb"; public static final String VIRT_CPU = "kickstart.virt_cpus"; @@ -246,10 +248,13 @@ public class ConfigDefaults { /** * Returns the base directory where the virt artifacts will be stored. * This information is used while setting up system records and so on.. + * @param xen true if the virt path required is for a xen virt type. * @return the virt path.. */ - public File getVirtPath() { - return new File(Config.get().getString(VIRT_PATH_DIR, DEFAULT_VIRT_PATH)); + public File getVirtPath(boolean xen) { + String virtPath = xen ? XEN_VIRT_PATH_DIR : KVM_VIRT_PATH_DIR; + String defaultVirtPath = xen ? DEFAULT_XEN_VIRT_PATH : DEFAULT_KVM_VIRT_PATH; + return new File(Config.get().getString(virtPath, defaultVirtPath)); }
/** 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 3e5ad9d..3744a7e 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 @@ -52,7 +52,7 @@ public class ProvisionVirtualizationWizardAction extends ScheduleKickstartWizard public static final String VIRTUAL_BRIDGE = "virtBridge"; public static final String VIRTUAL_FILE_PATH = "diskPath"; public static final String LOCAL_STORAGE_MB = "localStorageMegabytes"; - public static final String PROFILE = "profile"; + public static final String PROFILE = "cobbler_profile";
public static final String GUEST_NAME = "guestName"; public static final int MIN_NAME_SIZE = 4; @@ -97,10 +97,14 @@ public class ProvisionVirtualizationWizardAction extends ScheduleKickstartWizard //saveMessages(ctx.getRequest(), errors); return runFirst(mapping, form, ctx, response, step); } + ActionForward forward = super.runSecond(mapping, form, ctx, response, step); + Profile pf = getCobblerProfile(ctx); + KickstartData ksdata = ctx.lookupAndBindKickstartData(); if (StringUtils.isEmpty(form.getString(VIRTUAL_FILE_PATH))) { form.set(VIRTUAL_FILE_PATH, ProvisionVirtualInstanceCommand. - makeDefaultVirtPath(form.getString(GUEST_NAME))); + makeDefaultVirtPath(form.getString(GUEST_NAME), + ksdata.getKickstartDefaults().getVirtualizationType())); } if (StringUtils.isEmpty(form.getString(MEMORY_ALLOCATION))) { form.set(MEMORY_ALLOCATION, String.valueOf(pf.getVirtRam())); @@ -122,7 +126,7 @@ public class ProvisionVirtualizationWizardAction extends ScheduleKickstartWizard form.set(TARGET_PROFILE_TYPE, KickstartScheduleCommand.TARGET_PROFILE_TYPE_NONE); } - return super.runSecond(mapping, form, ctx, response, step); + return forward; }
/** diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java index 0737a65..77ce4dd 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java @@ -25,6 +25,7 @@ import com.redhat.rhn.domain.action.kickstart.KickstartGuestAction; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.KickstartSession; +import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.kickstart.KickstartDto; @@ -304,7 +305,8 @@ public class ProvisionVirtualInstanceCommand extends KickstartScheduleCommand { public void setFilePath(String filePathIn) { this.filePath = filePathIn; if (StringUtils.isBlank(filePath)) { - filePath = makeDefaultVirtPath(getGuestName()); + filePath = makeDefaultVirtPath(getGuestName(), + getKsdata().getKickstartDefaults().getVirtualizationType()); } }
@@ -327,11 +329,16 @@ public class ProvisionVirtualInstanceCommand extends KickstartScheduleCommand { /** * Method to set up the default virt path where the guset will be stored * based on the guest name. - * @param name the name of the guest + * @param name the name of the guest + * @param type virtualization type to determine the virt paths + * its different for xen/kvm * @return the virt path. */ - public static String makeDefaultVirtPath(String name) { - File virtPathDir = ConfigDefaults.get().getVirtPath(); + public static String makeDefaultVirtPath(String name, + KickstartVirtualizationType type) { + File virtPathDir = ConfigDefaults.get().getVirtPath( + KickstartVirtualizationType.xenPV().equals(type) || + KickstartVirtualizationType.xenFV().equals(type)); File virtPath = new File(virtPathDir, name.replace(' ', '-')); return virtPath.getAbsolutePath(); }
commit d6e2e13a13343a823cb905ea80fdfd396c134b7e Author: Devan Goodwin dgoodwin@redhat.com Date: Mon Jul 20 15:18:54 2009 -0300
Automatic commit of package [spacewalk] release [0.6.2-1].
diff --git a/rel-eng/packages/spacewalk b/rel-eng/packages/spacewalk index f689992..c981907 100644 --- a/rel-eng/packages/spacewalk +++ b/rel-eng/packages/spacewalk @@ -1 +1 @@ -0.6.1-1 spacewalk/package/ +0.6.2-1 spacewalk/package/ diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec index 41ea5e5..895c512 100644 --- a/spacewalk/package/spacewalk.spec +++ b/spacewalk/package/spacewalk.spec @@ -1,6 +1,6 @@ %define release_name Alpha Name: spacewalk -Version: 0.6.1 +Version: 0.6.2 Release: 1%{?dist} Summary: Spacewalk Systems Management Application URL: https://fedorahosted.org/spacewalk @@ -92,6 +92,9 @@ rm -rf %{buildroot} /%{_sysconfdir}/spacewalk-release
%changelog +* Mon Jul 20 2009 Devan Goodwin dgoodwin@redhat.com 0.6.2-1 +- Disabling spacewalk selinux support temporarily. (dgoodwin@redhat.com) + * Fri Apr 17 2009 Devan Goodwin dgoodwin@redhat.com 0.6.1-1 - bump Versions to 0.6.0 (jesusr@redhat.com)
commit efc2880b6a3b7814f4a236b1e55455c427edde62 Author: Devan Goodwin dgoodwin@redhat.com Date: Mon Jul 20 15:16:06 2009 -0300
tito: Fix md5 issues for el5.
Related somehow to new stronger hashes introduced in Fedora 11. While we only really want this for el5, the defines are harmless for other builds.
diff --git a/rel-eng/lib/spacewalk/releng/builder.py b/rel-eng/lib/spacewalk/releng/builder.py index 52e0101..8fe6e39 100644 --- a/rel-eng/lib/spacewalk/releng/builder.py +++ b/rel-eng/lib/spacewalk/releng/builder.py @@ -182,7 +182,7 @@ class Builder(object): elif dist: define_dist = "--define 'dist %s'" % dist
- cmd = "rpmbuild %s %s --nodeps -bs %s" % \ + cmd = 'rpmbuild --define "_source_filedigest_algorithm md5" --define "_binary_filedigest_algorithm md5" %s %s --nodeps -bs %s' % \ (self._get_rpmbuild_dir_options(), define_dist, self.spec_file) output = run_command(cmd) print(output) @@ -200,7 +200,7 @@ class Builder(object): define_dist = "" if self.dist: define_dist = "--define 'dist %s'" % self.dist - cmd = "rpmbuild %s %s --clean -ba %s" % \ + cmd = 'rpmbuild --define "_source_filedigest_algorithm md5" --define "_binary_filedigest_algorithm md5" %s %s --clean -ba %s' % \ (self._get_rpmbuild_dir_options(), define_dist, self.spec_file) output = run_command(cmd) print output
commit 34124fc9516ad179c88d504c4554af169a9c388d Author: Devan Goodwin dgoodwin@redhat.com Date: Mon Jul 20 15:14:28 2009 -0300
Disabling spacewalk selinux support temporarily.
Some of these packages are not buildable on Fedora 11, and selinux is blocking httpd on EL5 as well.
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec index 9a34fa9..41ea5e5 100644 --- a/spacewalk/package/spacewalk.spec +++ b/spacewalk/package/spacewalk.spec @@ -62,10 +62,10 @@ Requires: spacewalk-monitoring # Requires: rhn_solaris_bootstrap_5_1_0_3
# SELinux -Requires: spacewalk-selinux -Requires: jabberd-selinux -Requires: osa-dispatcher-selinux -Requires: spacewalk-monitoring-selinux +#Requires: spacewalk-selinux +#Requires: jabberd-selinux +#Requires: osa-dispatcher-selinux +#Requires: spacewalk-monitoring-selinux
%description
commit 64b21392f5c9f2243c68a36fe6c680a85b274567 Author: Partha Aji paji@redhat.com Date: Mon Jul 20 14:11:00 2009 -0400
510785 - Removed the 'valid' column from the ks profiles list
This is a useless column since the issue is with Distros not being valid and not profiles. So the Distros list will show invalid distros
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartDto.java b/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartDto.java index 5d3bb30..c7e9819 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartDto.java @@ -25,7 +25,6 @@ import org.apache.commons.lang.StringUtils; * @version $Rev: 50942 $ */ public class KickstartDto extends BaseDto { - private boolean valid; private Long id; private Long orgId; private Long kstreeId; @@ -258,26 +257,4 @@ public class KickstartDto extends BaseDto { public void setVirtBridge(String virtBridgeIn) { this.virtBridge = virtBridgeIn; } - - /** - * Checks if the profile is valid - * @return true if it is valid.. - */ - public boolean isValid() { - if (isCobbler()) { - return true; - } - if (StringUtils.isBlank(cobblerId)) { - return false; - } - return valid; - } - - /** - * true if the profile is valid - * @param isValid if the profile is valid - */ - public void setValid(boolean isValid) { - valid = isValid; - } } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java index d12b01d..39c9523 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java @@ -29,6 +29,7 @@ import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.manager.BaseManager; import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
+import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.cobbler.CobblerConnection; import org.cobbler.Distro; @@ -95,16 +96,6 @@ public class KickstartLister extends BaseManager { logger.debug("kickstartsInOrg(Org, PageControl) - end - return value=" + returnDataResult); } - - Set<Long> ids = new HashSet<Long>(); - List<KickstartableTree> trees = KickstartManager.getInstance(). - removeInvalid(KickstartFactory.lookupAccessibleTreesByOrg(orgIn)); - for (KickstartableTree tree : trees) { - ids.add(tree.getId()); - } - for (KickstartDto dto : returnDataResult) { - dto.setValid(ids.contains(dto.getKstreeId())); - } return returnDataResult; }
@@ -437,9 +428,34 @@ public class KickstartLister extends BaseManager { public List <KickstartDto> listProfilesForSsm(User user) { List <KickstartDto> ret = new LinkedList<KickstartDto>(); ret.addAll(kickstartsInOrg(user.getOrg(), null)); + pruneInvalid(user, ret); ret.addAll(listCobblerProfiles(user)); setKickstartUrls(ret, user); return ret; } - + + /** + * Given a list of Kickstart DTOs + * the code below removes all the profiles + * that are associated to an invalid distro. + * or not synced to spacewalk. Mainly used in schedule* pages + * @param user the user to get org info. + * @param profiles the kickstart dto list to be pruned + */ + public void pruneInvalid(User user, List<KickstartDto> profiles) { + Set<Long> ids = new HashSet<Long>(); + List<KickstartableTree> trees = KickstartManager.getInstance(). + removeInvalid(KickstartFactory. + lookupAccessibleTreesByOrg(user.getOrg())); + for (KickstartableTree tree : trees) { + ids.add(tree.getId()); + } + for (Iterator<KickstartDto> itr = profiles.iterator(); itr.hasNext();) { + KickstartDto dto = itr.next(); + if (StringUtils.isBlank(dto.getCobblerId()) || + !ids.contains(dto.getKstreeId())) { + itr.remove(); + } + } + } } 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 717683e..ff57259 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java @@ -404,6 +404,8 @@ public class KickstartScheduleCommand extends BaseSystemOperation { log.debug("got back from DB: " + retval); } KickstartLister.getInstance().setKickstartUrls(retval, user); + KickstartLister.getInstance().pruneInvalid(user, retval); + retval.setTotalSize(retval.size()); } }
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp index de3f3f0..fc8969b 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp @@ -61,7 +61,7 @@ <rl:column headerkey="kickstart.distro.label.jsp" sortattr="treeLabel"> <c:out value="${current.treeLabel}"/> </rl:column> - <rl:column headerkey="kickstart.distro.sw_managed.jsp" sortattr="cobbler"> + <rl:column headerkey="kickstart.distro.sw_managed.jsp" sortattr="cobbler" styleclass="last-column"> <c:choose> <c:when test="${current.cobbler}"> <img src="/img/rhn-listicon-error.gif"> @@ -71,17 +71,7 @@ </c:otherwise> </c:choose> </rl:column> - <rl:column headertext="${rhn:localize('kickstart.distro.is-valid.jsp')}?***" sortattr="valid" styleclass="last-column"> - <c:choose> - <c:when test="${current.valid}"> - <img src="/img/rhn-listicon-checked.gif"> - </c:when> - <c:otherwise> - <img src="/img/rhn-listicon-error.gif"> - </c:otherwise> - </c:choose> - </rl:column> - </rl:list> + </rl:list>
</rl:listset> </div> @@ -89,8 +79,6 @@ <c:if test="${not empty requestScope.orgDefaultExists}"> <p>rhn:tooltip** - <bean:message key="kickstart.list.jsp.orgdefault"/></rhn:tooltip></p> </c:if> - <p>rhn:tooltip***-<bean:message key="kickstarts.profile.is-valid.tooltip"/></rhn:tooltip></p> - </body> </html:html>
commit db1c74f458810578ee7f7ad73c5df233f29a9362 Author: Devan Goodwin dgoodwin@redhat.com Date: Mon Jul 20 14:47:01 2009 -0300
Automatic commit of package [perl-NOCpulse-OracleDB] release [1.28.16-1].
diff --git a/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec b/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec index d7def1f..770c756 100644 --- a/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec +++ b/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec @@ -1,5 +1,5 @@ Name: perl-NOCpulse-OracleDB -Version: 1.28.14 +Version: 1.28.16 Release: 1%{?dist} Summary: Perl modules for NOCpulse Oracle database access URL: https://fedorahosted.org/spacewalk @@ -47,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorlib}/NOCpulse/*
%changelog -* Mon Jul 20 2009 Devan Goodwin dgoodwin@redhat.com 1.28.14-1 +* Mon Jul 20 2009 Devan Goodwin dgoodwin@redhat.com 1.28.16-1 - Dropping unecessary perl-NOCpulse-OracleDB build requires. (dgoodwin@redhat.com)
diff --git a/rel-eng/packages/perl-NOCpulse-OracleDB b/rel-eng/packages/perl-NOCpulse-OracleDB index dc11b35..db5e264 100644 --- a/rel-eng/packages/perl-NOCpulse-OracleDB +++ b/rel-eng/packages/perl-NOCpulse-OracleDB @@ -1 +1 @@ -1.28.14-1 monitoring/PerlModules/NP/OracleDB/ +1.28.16-1 monitoring/PerlModules/NP/OracleDB/
commit a31165f2094de1f76f86f76bdaa6b21ed44d72dd Author: Devan Goodwin dgoodwin@redhat.com Date: Mon Jul 20 12:18:15 2009 -0300
Automatic commit of package [osad] release [5.9.16-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index af7f203..f4f003f 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -9,7 +9,7 @@ Group: System Environment/Daemons License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 5.9.15 +Version: 5.9.16 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -237,6 +237,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvvi {}
# $Id$ %changelog +* Mon Jul 20 2009 Devan Goodwin dgoodwin@redhat.com 5.9.16-1 +- Add osad BuildRequires for python-devel. (dgoodwin@redhat.com) + * Thu Jun 25 2009 John Matthews jmatthew@redhat.com 5.9.15-1 - 508064 - fix osad installation errors on client (mzazrivec@redhat.com)
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index 98af1c7..20e08db 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.9.15-1 client/tools/osad/ +5.9.16-1 client/tools/osad/
commit ef01909370c088d045fbd1b48c68f4ac1c15ceba Author: Devan Goodwin dgoodwin@redhat.com Date: Mon Jul 20 12:17:44 2009 -0300
Add osad BuildRequires for python-devel.
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index e165bda..af7f203 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -13,6 +13,7 @@ Version: 5.9.15 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: python-devel Requires: python Requires: rhnlib >= 1.8-3 Requires: jabberpy
commit 0d7db2b9c20dc7aa4efac1eca2b17aff15804cb9 Author: Partha Aji paji@redhat.com Date: Mon Jul 20 10:59:37 2009 -0400
512396 - Cobbler's KS meta can store ints while our code was expecting them to be all strings
diff --git a/java/code/src/com/redhat/rhn/common/util/StringUtil.java b/java/code/src/com/redhat/rhn/common/util/StringUtil.java index d09206a..5f7d246 100644 --- a/java/code/src/com/redhat/rhn/common/util/StringUtil.java +++ b/java/code/src/com/redhat/rhn/common/util/StringUtil.java @@ -747,7 +747,7 @@ public class StringUtil { * @param seperator the seperator to seperate the pairs with * @return the formatted string */ - public static String convertMapToString(Map<String, String> map, String seperator) { + public static String convertMapToString(Map<String, Object> map, String seperator) {
StringBuilder string = new StringBuilder(); for (Object key : map.keySet()) { diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index cc08b0a..cb90be6 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -4062,7 +4062,7 @@ public class SystemHandler extends BaseHandler { String hostName = (String)data.get("hostname"); String command = KickstartFormatter.makeStaticNetworkCommand(device, ip, gateway, nameservers.get(0), netmask, hostName); - Map<String, String> meta = rec.getKsMeta(); + Map<String, Object> meta = rec.getKsMeta(); meta.put(KickstartFormatter.STATIC_NETWORK_VAR, command); rec.setKsMeta(meta); rec.save(); diff --git a/java/code/src/org/cobbler/CobblerObject.java b/java/code/src/org/cobbler/CobblerObject.java index 2e18e28..57e0299 100644 --- a/java/code/src/org/cobbler/CobblerObject.java +++ b/java/code/src/org/cobbler/CobblerObject.java @@ -389,15 +389,15 @@ public abstract class CobblerObject { /** * @return the kernelMeta */ - public Map<String, String> getKsMeta() { - return (Map<String, String>)dataMap.get(KS_META); + public Map<String, Object> getKsMeta() { + return (Map<String, Object>)dataMap.get(KS_META); }
/** * @param kernelMetaIn the kernelMeta to set */ - public void setKsMeta(Map<String, String> kernelMetaIn) { + public void setKsMeta(Map<String, ? extends Object> kernelMetaIn) { modify(SET_KS_META, kernelMetaIn); }
commit a03d8c37a431623d61ed44597e1a1559bb2d76ee Author: Devan Goodwin dgoodwin@redhat.com Date: Mon Jul 20 10:18:09 2009 -0300
Automatic commit of package [perl-NOCpulse-OracleDB] release [1.28.14-1].
diff --git a/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec b/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec index 2504593..d7def1f 100644 --- a/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec +++ b/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec @@ -1,5 +1,5 @@ Name: perl-NOCpulse-OracleDB -Version: 1.28.13 +Version: 1.28.14 Release: 1%{?dist} Summary: Perl modules for NOCpulse Oracle database access URL: https://fedorahosted.org/spacewalk @@ -47,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorlib}/NOCpulse/*
%changelog +* Mon Jul 20 2009 Devan Goodwin dgoodwin@redhat.com 1.28.14-1 +- Dropping unecessary perl-NOCpulse-OracleDB build requires. + (dgoodwin@redhat.com) + * Mon May 11 2009 Miroslav Suchý msuchy@redhat.com 1.28.13-1 - 499568 - allow LoadOneFrom to accept binded params
diff --git a/rel-eng/packages/perl-NOCpulse-OracleDB b/rel-eng/packages/perl-NOCpulse-OracleDB index 9c7926c..dc11b35 100644 --- a/rel-eng/packages/perl-NOCpulse-OracleDB +++ b/rel-eng/packages/perl-NOCpulse-OracleDB @@ -1 +1 @@ -1.28.13-1 monitoring/PerlModules/NP/OracleDB/ +1.28.14-1 monitoring/PerlModules/NP/OracleDB/
commit 7eb28115a2fc33d3ff3408ba8f9b5a65fe42b7ac Author: Devan Goodwin dgoodwin@redhat.com Date: Mon Jul 20 10:16:47 2009 -0300
Dropping unecessary perl-NOCpulse-OracleDB build requires.
diff --git a/monitoring/PerlModules/NP/OracleDB/OracleDB.pm b/monitoring/PerlModules/NP/OracleDB/OracleDB.pm index b41bab7..8236df3 100644 --- a/monitoring/PerlModules/NP/OracleDB/OracleDB.pm +++ b/monitoring/PerlModules/NP/OracleDB/OracleDB.pm @@ -7,7 +7,6 @@ $VERSION = (split(/\s+/, q$Id: OracleDB.pm,v 1.3 2005-07-06 20:51:40 nhansen Exp
use strict; use DBI; -use DBD::Oracle; use NOCpulse::Debug; use NOCpulse::Config;
diff --git a/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec b/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec index 680777c..2504593 100644 --- a/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec +++ b/monitoring/PerlModules/NP/OracleDB/perl-NOCpulse-OracleDB.spec @@ -7,7 +7,7 @@ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl(NOCpulse::Debug) perl(NOCpulse::Config) perl(NOCpulse::Utils::XML) perl(NOCpulse::Object) -BuildRequires: perl(DBD::Oracle) perl(DBI) perl(ExtUtils::MakeMaker) +BuildRequires: perl(DBI) perl(ExtUtils::MakeMaker) Group: Development/Libraries License: GPLv2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
commit fac0c83fd924e901aa5cac32be6bf125806046c1 Author: Miroslav Suchý msuchy@redhat.com Date: Mon Jul 20 13:31:04 2009 +0200
Automatic commit of package [spacewalk-proxy-installer] release [0.6.20-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec index b6d49e6..0f99b78 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer Summary: Spacewalk Proxy Server Installer Group: Applications/Internet License: GPLv2 -Version: 0.6.19 +Version: 0.6.20 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE answers.txt
%changelog +* Mon Jul 20 2009 Miroslav Suchy msuchy@redhat.com 0.6.20-1 +- 496615 - take up 1 as yes + * Mon Jul 13 2009 Miroslav Suchy msuchy@redhat.com 0.6.19-1 - 509450 - install our jabberd ssl cert during proxy installation
diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer index fcf9bbd..ff91d33 100644 --- a/rel-eng/packages/spacewalk-proxy-installer +++ b/rel-eng/packages/spacewalk-proxy-installer @@ -1 +1 @@ -0.6.19-1 proxy/installer/ +0.6.20-1 proxy/installer/
commit b08e741d965535d9d67cb61abbd0200d6fa936e9 Author: Miroslav Suchý msuchy@redhat.com Date: Mon Jul 20 13:30:10 2009 +0200
496615 - take up 1 as yes
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index e45daee..7c5563b 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -141,7 +141,7 @@ default_or_input () {
yes_no() { case "$1" in - Y|y|Y/n|n/Y) + Y|y|Y/n|n/Y|1) echo 1 ;; *)
commit d718d285910a197e289204651d83c6058d562c3f Author: Partha Aji paji@redhat.com Date: Sat Jul 18 01:52:39 2009 -0400
Fixed unit tests
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java index e46b6ca..a3a5d08 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java @@ -69,7 +69,6 @@ import org.cobbler.test.MockConnection; import org.hibernate.Session;
import java.io.File; -import java.io.IOException; import java.util.Collection; import java.util.Date; import java.util.HashSet; @@ -86,12 +85,20 @@ public class KickstartDataTest extends BaseTestCaseWithUser { private static final String STATIC_DEV = "dhcp:eth0"; private static final String KERNEL_PARAMS = "ide0=ata66";
- public static void setupTestConfiguration() throws IOException { + + public static void setupTestConfiguration() throws Exception { Config.get().setString(CobblerXMLRPCHelper.class.getName(), MockXMLRPCInvoker.class.getName()); Config.get().setString(ConfigDefaults.KICKSTART_COBBLER_DIR, "/tmp/kickstart/"); Config.get().setString(ConfigDefaults.COBBLER_SNIPPETS_DIR, "/tmp/kickstart/snippets"); + Config.get().setString(ConfigDefaults.MOUNT_POINT, "/tmp/kickstart/mount_point"); + createDirIfNotExists(new File("/tmp/kickstart/mount_point")); + + Config.get().setString(ConfigDefaults.KICKSTART_MOUNT_POINT, + "/tmp/kickstart/kickstart_mount_point"); + createDirIfNotExists(new File("/tmp/kickstart/kickstart_mount_point")); + Config.get().setString(CobblerConnection.class.getName(), MockConnection.class.getName()); createKickstartDirs(); @@ -99,31 +106,15 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
}
- public static void createKickstartDirs() throws IOException { + public static void createKickstartDirs() throws Exception { createDirIfNotExists(new File(ConfigDefaults.get().getKickstartConfigDir() + "/" + KickstartData.WIZARD_DIR)); createDirIfNotExists(new File(ConfigDefaults.get().getKickstartConfigDir() + "/" + KickstartData.RAW_DIR)); createDirIfNotExists(CobblerSnippet.getSpacewalkSnippetsDir()); + KickstartableTreeTest.createKickstartTreeItems(); }
- private static void createDirIfNotExists(File dir) throws IOException { - String error = - "Could not create the following directory:[" + dir.getPath() + - "] . Please create that directory before proceeding with the tests"; - if (dir.exists() && !dir.isDirectory()) { - if (!dir.renameTo(new File(dir.getPath() + ".bak")) && - !dir.delete()) { - throw new RuntimeException(error); - } - } - - if (!dir.exists() && !dir.mkdirs()) { - throw new RuntimeException(error); - } - } - - public static void createCobblerObjects(KickstartData k) { Distro d = Distro.lookupById(CobblerXMLRPCHelper.getConnection("test"), k.getKickstartDefaults().getKstree().getCobblerId()); diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeTest.java index 579d63d..8608daf 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeTest.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartableTreeTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.domain.kickstart.test;
import com.redhat.rhn.common.hibernate.HibernateFactory; +import com.redhat.rhn.common.util.FileUtils; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.test.ChannelFactoryTest; import com.redhat.rhn.domain.kickstart.KickstartData; @@ -24,15 +25,18 @@ import com.redhat.rhn.domain.kickstart.KickstartTreeType; import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; +import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; import com.redhat.rhn.testing.BaseTestCaseWithUser; import com.redhat.rhn.testing.ChannelTestUtils; import com.redhat.rhn.testing.TestUtils; +import com.redhat.rhn.testing.UserTestUtils;
import org.apache.commons.lang.RandomStringUtils; import org.cobbler.Distro; import org.hibernate.Session;
+import java.io.File; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -44,6 +48,36 @@ import java.util.List; public class KickstartableTreeTest extends BaseTestCaseWithUser {
public static final String TEST_BOOT_PATH = "test-boot-image-i186"; + public static final File KICKSTART_TREE_PATH = new File("/tmp/kickstart/images"); + + public static void createKickstartTreeItems() throws Exception { + createKickstartTreeItems(KICKSTART_TREE_PATH); + } + + public static void createKickstartTreeItems(File basePath) throws Exception { + //Alright setup things we need for trees + createDirIfNotExists(basePath); + KickstartableTree tree = new KickstartableTree(); + User user = UserTestUtils.findNewUser("testUser", "testOrg"); + tree.setChannel(ChannelTestUtils.createBaseChannel(user)); + tree.setBasePath(basePath.getAbsolutePath()); + tree.setOrg(user.getOrg()); + createKickstartTreeItems(tree); + } + + public static void createKickstartTreeItems(KickstartableTree tree) throws Exception { + createDirIfNotExists(new File(tree.getKernelPath()).getParentFile()); + createDirIfNotExists(new File(tree.getKernelXenPath()).getParentFile()); + + FileUtils.writeStringToFile("kernel", tree.getKernelPath()); + FileUtils.writeStringToFile("kernel-xen", tree.getKernelXenPath()); + + createDirIfNotExists(new File(tree.getInitrdPath()).getParentFile()); + createDirIfNotExists(new File(tree.getInitrdXenPath()).getParentFile()); + + FileUtils.writeStringToFile("initrd", tree.getInitrdPath()); + FileUtils.writeStringToFile("initrd-xen", tree.getInitrdXenPath()); + }
public void testKickstartableTree() throws Exception { KickstartableTree k = createTestKickstartableTree(); @@ -137,8 +171,6 @@ public class KickstartableTreeTest extends BaseTestCaseWithUser { */ public static KickstartableTree createTestKickstartableTree(Channel treeChannel) throws Exception { - - Date created = new Date(); Date modified = new Date(); Date lastmodified = new Date(); @@ -156,7 +188,7 @@ public class KickstartableTreeTest extends BaseTestCaseWithUser { k.setLabel("ks-" + treeChannel.getLabel() + RandomStringUtils.randomAlphanumeric(5));
- k.setBasePath("rhn/kickstart/" + k.getLabel()); + k.setBasePath(KICKSTART_TREE_PATH.getAbsolutePath()); k.setCreated(created); k.setModified(modified); k.setOrg(treeChannel.getOrg()); @@ -165,6 +197,8 @@ public class KickstartableTreeTest extends BaseTestCaseWithUser { k.setTreeType(treetype); k.setChannel(treeChannel);
+ createKickstartTreeItems(k); + Distro d = Distro.create(CobblerXMLRPCHelper.getConnection("test"), k.getLabel(), k.getKernelPath(), k.getInitrdPath(), new HashMap()); Distro xend = Distro.create(CobblerXMLRPCHelper.getConnection("test"), diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java index 8cc5984..7ab9fa8 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java @@ -45,8 +45,6 @@ import java.util.List; */ public class TreeActionTest extends RhnMockStrutsTestCase {
- private static final String BASE_PATH = "http://rhn.redhat.com/somepath"; - public void testCreateNonSubmit() throws Exception { UserTestUtils.addUserRole(user, RoleFactory.CONFIG_ADMIN); UserTestUtils.addProvisioning(user.getOrg()); @@ -93,7 +91,8 @@ public class TreeActionTest extends RhnMockStrutsTestCase { // Set fields on the form to verify values are saved after a refresh: String ksDistLabel = "somelabel" + TestUtils.randomString(); addRequestParameter(TreeCreateAction.LABEL, ksDistLabel); - addRequestParameter(TreeCreateAction.BASE_PATH, BASE_PATH); + addRequestParameter(TreeCreateAction.BASE_PATH, + KickstartableTreeTest.KICKSTART_TREE_PATH.getAbsolutePath());
// Choose the RHEL 5 base channel so we can verify the package list is updated: addRequestParameter(TreeCreateAction.CHANNEL_ID, rhel5BaseChan.getId().toString()); @@ -102,7 +101,8 @@ public class TreeActionTest extends RhnMockStrutsTestCase {
// Verify that things are as they should be after a refresh: verifyFormValue(TreeCreateAction.LABEL, ksDistLabel); - verifyFormValue(TreeCreateAction.BASE_PATH, BASE_PATH); + verifyFormValue(TreeCreateAction.BASE_PATH, + KickstartableTreeTest.KICKSTART_TREE_PATH.getAbsolutePath()); verifyFormValue(TreeCreateAction.CHANNEL_ID, rhel5BaseChan.getId());
} @@ -203,7 +203,8 @@ public class TreeActionTest extends RhnMockStrutsTestCase {
addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString()); setRequestPathInfo(path); - addRequestParameter(TreeCreateAction.BASE_PATH, BASE_PATH); + addRequestParameter(TreeCreateAction.BASE_PATH, + KickstartableTreeTest.KICKSTART_TREE_PATH.getAbsolutePath()); addRequestParameter(TreeCreateAction.CHANNEL_ID, c.getId().toString()); addRequestParameter(TreeCreateAction.LABEL, newLabel); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java index 6672255..09ba2f8 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java @@ -27,6 +27,7 @@ import com.redhat.rhn.frontend.xmlrpc.kickstart.tree.KickstartTreeHandler; import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase; import com.redhat.rhn.testing.TestUtils;
+import java.io.File; import java.util.List;
/** @@ -67,7 +68,7 @@ public class KickstartTreeHandlerTest extends BaseHandlerTestCase { } Channel baseChan = ChannelFactoryTest.createTestChannel(admin); handler.create(adminKey, label, - "http://localhost/ks", + KickstartableTreeTest.KICKSTART_TREE_PATH.getAbsolutePath(), baseChan.getLabel(), KickstartInstallType.RHEL_5); assertTrue(origCount + 1 == KickstartFactory. lookupAccessibleTreesByOrg(admin.getOrg()).size()); @@ -77,9 +78,9 @@ public class KickstartTreeHandlerTest extends BaseHandlerTestCase { Channel baseChan = ChannelFactoryTest.createTestChannel(admin); KickstartableTree testTree = KickstartableTreeTest. createTestKickstartableTree(baseChan); - String newBase = "/tmp/new-base-path"; + String newBase = "/tmp/kickstart/new-base-path"; + KickstartableTreeTest.createKickstartTreeItems(new File(newBase)); Channel newChan = ChannelFactoryTest.createTestChannel(admin); - handler.update(adminKey, testTree.getLabel(), newBase, newChan.getLabel(), testTree.getInstallType().getLabel()); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardCommandTest.java index d158af0..e074ac1 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardCommandTest.java @@ -39,10 +39,10 @@ public class KickstartWizardCommandTest extends BaseTestCaseWithUser {
public void testWizTrees() throws Exception {
- Channel c = ChannelFactoryTest.createTestChannel(user); + Channel c = ChannelFactoryTest.createBaseChannel(user); assertNull(c.getParentChannel()); + assertNull(c.getOrg()); KickstartableTree tree = KickstartableTreeTest.createTestKickstartableTree(c); - tree.setOrg(null); tree.setChannel(c); TestUtils.saveAndFlush(tree); TestUtils.saveAndFlush(c); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/tree/test/TreeEditOperationTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/tree/test/TreeEditOperationTest.java index f10890c..284987a 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/tree/test/TreeEditOperationTest.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/tree/test/TreeEditOperationTest.java @@ -43,7 +43,7 @@ public class TreeEditOperationTest extends BaseTestCaseWithUser { KickstartableTree tree = KickstartableTreeTest. createTestKickstartableTree(ChannelFactoryTest.createTestChannel(user)); TreeEditOperation cmd = new TreeEditOperation(tree.getId(), user); - cmd.setBasePath("http://somepath.redhat.com/"); + cmd.setBasePath(KickstartableTreeTest.KICKSTART_TREE_PATH.getAbsolutePath()); assertNotNull(cmd.getTree()); String nlabel = "newlabel" + TestUtils.randomString(); cmd.setLabel(nlabel); @@ -58,7 +58,7 @@ public class TreeEditOperationTest extends BaseTestCaseWithUser { createTestKickstartableTree(ChannelFactoryTest.createTestChannel(user)); Long tid = tree.getId(); TreeEditOperation cmd = new TreeEditOperation(tid, user); - cmd.setBasePath("http://somepath.redhat.com/"); + cmd.setBasePath(KickstartableTreeTest.KICKSTART_TREE_PATH.getAbsolutePath()); assertNull(cmd.store()); flushAndEvict(cmd.getTree());
@@ -105,7 +105,7 @@ public class TreeEditOperationTest extends BaseTestCaseWithUser { private void setTreeParamsAndStore(BaseTreeEditOperation cmd) throws Exception { cmd.setInstallType(KickstartFactory. lookupKickstartInstallTypeByLabel("rhel_4")); - cmd.setBasePath("http://rhn.redhat.com/sometree"); + cmd.setBasePath(KickstartableTreeTest.KICKSTART_TREE_PATH.getAbsolutePath()); cmd.setChannel(ChannelFactoryTest.createTestChannel(user)); cmd.setLabel("some_label" + TestUtils.randomString()); assertNotNull(cmd.getUser()); diff --git a/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java b/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java index 42c7c8d..f4068b6 100644 --- a/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java +++ b/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java @@ -26,6 +26,8 @@ import org.apache.log4j.Logger; import org.hibernate.HibernateException; import org.hibernate.Session;
+import java.io.File; +import java.io.IOException; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.text.DateFormat; @@ -266,5 +268,19 @@ public abstract class RhnBaseTestCase extends TestCase { log.setLevel(Level.ERROR); }
- + protected static void createDirIfNotExists(File dir) throws IOException { + String error = + "Could not create the following directory:[" + dir.getPath() + + "] . Please create that directory before proceeding with the tests"; + if (dir.exists() && !dir.isDirectory()) { + if (!dir.renameTo(new File(dir.getPath() + ".bak")) && + !dir.delete()) { + throw new RuntimeException(error); + } + } + + if (!dir.exists() && !dir.mkdirs()) { + throw new RuntimeException(error); + } + } }
commit e07bd38acd7742300cdbce9c49a77273bcbf6310 Author: Partha Aji paji@redhat.com Date: Sat Jul 18 00:42:59 2009 -0400
510785 - Handled an edge case where there are NO valid trees available in KS raw mode..
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf index f813202..2c6f61c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf @@ -122,7 +122,7 @@ <th><rhn:required-field key="kickstart.jsp.create.wizard.kstree.label"/>:</th> <td> <c:choose> - <c:when test="${notrees == null}"> + <c:when test="${empty notrees}"> <html:select property="kstreeId"> <html:optionsCollection property="kstrees" label="label" value="id" /> </html:select> @@ -133,15 +133,19 @@ </c:choose> </td> </tr> + </table> + <c:if test="${empty notrees}"> <div align="right"> - </table> - <hr /> + <hr /> + <html:submit property="dispatch"> <bean:message key="${param.action_key}"/> </html:submit> + </div> rhn:submitted/ <input type="hidden" name="ksid" value="${param.ksid}"/> + </c:if> </html:form> </c:when> </c:choose>
commit 5b88e84ef9c2101700433cbbf81e99383e855fa9 Author: Partha Aji paji@redhat.com Date: Fri Jul 17 23:49:39 2009 -0400
510785 - Major commit to deal with KS/Distro upgrade scenarios
This commit has a bunch of important changes 1) Concept of a "valid" Distro, implying one that has the right values for the initrd and kernel path. An example here will be cases where an external distro was specified but accidentally got deleted. So the UI and the cobbler records point to a non existent location.. This fix will put a X in the distros list marking the distro as invalid. All the profiles using this distro will also be marked invalid until the distro is either fixed or the profile's distro is changed.
2) Adds ability to neatly deal with profiles that have not yet been synced to cobbler. This is typically the be the upgrade scenario where the user might have the wrong paths on the distro so they never got created in cobbler and without a distro no profile can be created which implies the profiles didn;t themselves sync either. So in this case the UI will basically mark the profiles as invalid, No one will be able to schedule a KS off these profiles. In addition they will not be able to change any of the properties of a profile until the distro issue is resolved. Changes were made in the UI in both the Wizard and the Raw pages to reflect that.
Also removed several unused old methods...
diff --git a/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java b/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java index b1df18e..eebdf20 100644 --- a/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java +++ b/java/code/src/com/redhat/rhn/common/security/acl/KickstartAclHandler.java @@ -16,7 +16,11 @@ package com.redhat.rhn.common.security.acl;
import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; +import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.struts.RequestContext; + +import org.apache.commons.lang.StringUtils;
import java.util.HashMap;
@@ -26,17 +30,8 @@ import java.util.HashMap; * @version $Rev$ */ public class KickstartAclHandler extends BaseHandler { - - public static final String USER = "user"; - public static final String KSID = "ksid"; - - - /* - * Sometimes we have a context where key "cid" is the cid-string (nav-xml) - * Sometimes, "cid" is an array of strings of len-1 where the -entry- is the - * cid-str (rhn:require) Sigh. - */ - protected KickstartData getKickstart(User usr, String[] params) { + private static final String USER = "user"; + private KickstartData getKickstart(User usr, String[] params) { String ksStr = params[0]; Long id = null; try { @@ -45,7 +40,7 @@ public class KickstartAclHandler extends BaseHandler { catch (NumberFormatException nfe) { return null; } - + if (id != null) { KickstartData ks = KickstartFactory.lookupKickstartDataByIdAndOrg( usr.getOrg(), id); @@ -55,7 +50,7 @@ public class KickstartAclHandler extends BaseHandler { return null; } } - + /** * Is the user allowed to administer the specified channel? * @param ctx request context (user,cid) @@ -90,7 +85,44 @@ public class KickstartAclHandler extends BaseHandler { return !ks.isRawData(); }
- - - + /** + * Returns true if the kickstart tree + * is synced to cobbler + * @param ctx request context (user,kstid) + * @param params check parameters + * @return true if the kickstart tree is synced + * to cobbler + */ + public boolean aclTreeIsSynced(Object ctx, String[] params) { + HashMap ctxMap = (HashMap)ctx; + User usr = (User)ctxMap.get(USER); + Long id = getAsLong(ctxMap.get(RequestContext.KSTREE_ID)); + if (id == null) { + return false; + } + KickstartableTree ks = KickstartFactory. + lookupKickstartTreeByIdAndOrg(id, usr.getOrg()); + return !StringUtils.isBlank(ks.getCobblerId()); + } + + /** + * Returns true if the kickstart profile + * is synced to cobbler and if the profile + * has a valid distribution + * @param ctx request context (user,kstid) + * @param params check parameters + * @return true if the kickstart profile is valid + * to cobbler + */ + public boolean aclProfileIsValid(Object ctx, String[] params) { + HashMap ctxMap = (HashMap)ctx; + User usr = (User)ctxMap.get(USER); + Long id = getAsLong(ctxMap.get(RequestContext.KICKSTART_ID)); + if (id == null) { + return false; + } + KickstartData ks = KickstartFactory. + lookupKickstartDataByIdAndOrg(usr.getOrg(), id); + return !StringUtils.isBlank(ks.getCobblerId()) && ks.getTree().isValid(); + } } diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java index 61956b5..3324e5c 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java @@ -1503,4 +1503,14 @@ public class KickstartData { } return Profile.lookupById(con, getCobblerId()); } + + /** + * Method to determine if the profile + * is valid or if it needs to be corrected. + * @return true if the profile is synced to cobbler + * and the distro it hosts is valid. + */ + public boolean isValid() { + return !StringUtils.isBlank(getCobblerId()) && getTree().isValid(); + } } diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java index 6d1019e..ae19e78 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java @@ -567,8 +567,9 @@ public class KickstartFactory extends HibernateFactory { setLong("org_id", org.getId().longValue()). list(); return retval; - } - + } + + /** * Fetch all trees for an org, these include * trees where org_id is null or org_id = org.id @@ -578,7 +579,7 @@ public class KickstartFactory extends HibernateFactory { public static List <KickstartableTree> lookupAccessibleTreesByOrg(Org org) { Session session = null; List retval = null; - String query = "KickstartableTree.findAccesibleToOrg"; + String query = "KickstartableTree.findAccessibleToOrg"; session = HibernateFactory.getSession(); retval = session.getNamedQuery(query). setLong("org_id", org.getId().longValue()) 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 52a3b91..821eb6c 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 @@ -18,6 +18,7 @@ package com.redhat.rhn.frontend.action.kickstart; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.common.validator.ValidatorResult; +import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.KickstartRawData; import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType; @@ -94,13 +95,44 @@ public class AdvancedModeDetailsAction extends RhnAction { if (!context.isSubmitted()) { setup(context, form); } + else if (!isCreateMode(request) && !getKsData(context).isValid()) { + return submitInvalid(context, form, mapping); + } else { return submit(context, form, mapping); }
return mapping.findForward(RhnHelper.DEFAULT_FORWARD); } - + private ActionForward submitInvalid(RequestContext context, + DynaActionForm form, ActionMapping mapping) { + try { + KickstartData data = getKsData(context); + User user = context.getLoggedInUser(); + KickstartBuilder builder = new KickstartBuilder(user); + KickstartWizardHelper cmd = new KickstartWizardHelper(user); + KickstartableTree tree = cmd.getKickstartableTree( + (Long)form.get(KSTREE_ID_PARAM)); + builder.update(data, data.getLabel(), tree, + data.getKickstartDefaults().getVirtualizationType().getLabel()); + return getStrutsDelegate().forwardParam(mapping.findForward("success"), + RequestContext.KICKSTART_ID, data.getId().toString()); + } + catch (ValidatorException ve) { + RhnValidationHelper.setFailedValidation(context.getRequest()); + getStrutsDelegate().saveMessages(context.getRequest(), ve.getResult()); + setup(context, form); + if (!isCreateMode(context.getRequest())) { + KickstartRawData ks = getKsData(context); + return getStrutsDelegate().forwardParam(mapping. + findForward(RhnHelper.DEFAULT_FORWARD), + RequestContext.KICKSTART_ID, + ks.getId().toString()); + } + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); + } + } + private ActionForward submit(RequestContext context, DynaActionForm form, ActionMapping mapping) { try { @@ -156,6 +188,11 @@ public class AdvancedModeDetailsAction extends RhnAction { loadVirtualizationTypes(cmd, form, context); if (!isCreateMode(context.getRequest())) { KickstartRawData data = getKsData(context); + if (!data.isValid()) { + context.getRequest().setAttribute(KickstartDetailsEditAction.INVALID, + Boolean.TRUE); + return; + } form.set(KICKSTART_LABEL_PARAM, data.getLabel()); form.set(CONTENTS, data.getData()); KickstartFileDownloadCommand dcmd = new KickstartFileDownloadCommand( @@ -222,7 +259,7 @@ public class AdvancedModeDetailsAction extends RhnAction { return Boolean.TRUE.equals(request.getAttribute(CREATE_MODE)); }
- private void validateInput(DynaActionForm form, + private void validateInput(DynaActionForm form, RequestContext context) { String label = form.getString(KICKSTART_LABEL_PARAM); KickstartBuilder builder = new KickstartBuilder(context.getLoggedInUser()); 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 fe3660e..d5783f7 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 @@ -77,7 +77,7 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction { public static final String VIRT_BRIDGE = "virt_bridge"; public static final String VIRT_PATH = "virt_disk_path";
- + public static final String INVALID = "invalid";
/** {@inheritDoc} */ public ActionForward execute(ActionMapping mapping, @@ -86,7 +86,6 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction { HttpServletResponse response) { RequestContext context = new RequestContext(request); KickstartData data = context.lookupAndBindKickstartData(); -
if (data.isRawData()) { return getStrutsDelegate().forwardParam( @@ -104,6 +103,11 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction { DynaActionForm form, BaseKickstartCommand cmdIn) { KickstartEditCommand cmd = (KickstartEditCommand) cmdIn; form.set(LABEL, cmd.getLabel()); + if (!cmdIn.getKickstartData().isValid()) { + ctx.getRequest().setAttribute(INVALID, Boolean.TRUE); + return; + } + form.set(COMMENTS, cmd.getComments()); form.set(ACTIVE, cmd.getActive()); form.set(ORG_DEFAULT, cmd.getKickstartData().isOrgDefault()); @@ -325,6 +329,5 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction { RhnValidationHelper.setFailedValidation(context.getRequest()); strutsDelegate.saveMessages(context.getRequest(), ve.getResult()); } - - } + } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeEditAction.java index 9317622..e3ebe52 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/TreeEditAction.java @@ -14,15 +14,18 @@ */ package com.redhat.rhn.frontend.action.kickstart.tree;
+import com.redhat.rhn.common.validator.ValidatorException; +import com.redhat.rhn.common.validator.ValidatorResult; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.PersistOperation; -import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; import com.redhat.rhn.manager.kickstart.tree.BaseTreeEditOperation; import com.redhat.rhn.manager.kickstart.tree.TreeEditOperation;
import org.apache.struts.action.DynaActionForm; import org.cobbler.Distro;
+import javax.servlet.http.HttpServletRequest; + /** * TreeEditAction * @version $Rev$ @@ -35,8 +38,10 @@ public class TreeEditAction extends BaseTreeAction { protected void processRequestAttributes(RequestContext rctx, PersistOperation opr) { BaseTreeEditOperation bte = (BaseTreeEditOperation) opr; rctx.getRequest().setAttribute(RequestContext.KSTREE, bte.getTree()); - super.processRequestAttributes(rctx, opr); + if (!rctx.isSubmitted()) { + checkDistroValidity(rctx.getRequest(), bte); + } }
/** @@ -69,13 +74,25 @@ public class TreeEditAction extends BaseTreeAction { form.set(CHANNEL_ID, bte.getTree().getChannel().getId()); form.set(LABEL, bte.getTree().getLabel()); form.set(INSTALL_TYPE, bte.getTree().getInstallType().getLabel()); - - - Distro distro = Distro.lookupById(CobblerXMLRPCHelper.getConnection( - bte.getUser()), bte.getTree().getCobblerId()); - form.set(KERNEL_OPTS, distro.getKernelOptionsString()); - form.set(POST_KERNEL_OPTS, distro.getKernelPostOptionsString()); - + Distro distro = bte.getTree().getCobblerObject(bte.getUser()); + if (distro != null) { + form.set(KERNEL_OPTS, distro.getKernelOptionsString()); + form.set(POST_KERNEL_OPTS, distro.getKernelPostOptionsString()); + } }
+ private void checkDistroValidity(HttpServletRequest request, + BaseTreeEditOperation bte) { + try { + bte.validateBasePath(); + if (!bte.getTree().isValid()) { + ValidatorResult result = new ValidatorResult(); + result.addError("tree.edit.invalid_tree"); + getStrutsDelegate().saveMessages(request, result); + } + } + catch (ValidatorException ve) { + getStrutsDelegate().saveMessages(request, ve.getResult()); + } + } } diff --git a/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartDto.java b/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartDto.java index 4c813ef..5d3bb30 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/kickstart/KickstartDto.java @@ -25,7 +25,7 @@ import org.apache.commons.lang.StringUtils; * @version $Rev: 50942 $ */ public class KickstartDto extends BaseDto { - + private boolean valid; private Long id; private Long orgId; private Long kstreeId; @@ -258,4 +258,26 @@ public class KickstartDto extends BaseDto { public void setVirtBridge(String virtBridgeIn) { this.virtBridge = virtBridgeIn; } + + /** + * Checks if the profile is valid + * @return true if it is valid.. + */ + public boolean isValid() { + if (isCobbler()) { + return true; + } + if (StringUtils.isBlank(cobblerId)) { + return false; + } + return valid; + } + + /** + * true if the profile is valid + * @param isValid if the profile is valid + */ + public void setValid(boolean isValid) { + valid = isValid; + } } diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index e1e959c..a8952f6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -6266,7 +6266,13 @@ Follow this url to see the full list of inactive systems: <context-group name="ctx"> <context context-type="sourcefile">/rhn/kickstart/Troubleshooting.do</context> </context-group> - </trans-unit> + </trans-unit> + <trans-unit id="tree.edit.invalid_tree"> + <source>Kickstart distributions is invalid due wrong or non existent base path to the kernel or initrd image. To make your custom distribution valid please select the distribution and modify its base path appropriately.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/TreeEdit.do</context> + </context-group> + </trans-unit>
<trans-unit id="kickstart.troubleshooting.validation.kernelparams.too_long"> <source>Extra kernel parameters can be no longer than 128 characters.</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index ac272cd..aab7a1f 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 @@ -3038,7 +3038,6 @@ button below, and <b>will be unable to log back in</b>.</source> <context context-type="sourcefile">/rhn/schedule/PackageList</context> </context-group> </trans-unit> - schedu <trans-unit id="packagelist.jsp.nopackages"> <source>No packages.</source> <context-group name="ctx"> @@ -9863,6 +9862,33 @@ Please note that some manual configuration of these scripts may still be require <context context-type="sourcefile">/rhn/kickstart/KickstartDetailsEdit</context> </context-group> </trans-unit> + + <trans-unit id="kickstartdetails.invalid.jsp.summary"> + <source>The distribution associated to this kickstart profile is invalid. </source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/KickstartDetailsEdit</context> + </context-group> + </trans-unit> + + <trans-unit id="kickstartdetails.invalid.jsp.summary-option1"> + <source>To enable operations available to this kickstart profile, you may correct the distribution(<strong>{0}</strong>) by visiting the <a href = "{1}">Kickstart Distribution Details</a> page.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/KickstartDetailsEdit</context> + </context-group> + </trans-unit> + +<trans-unit id="kickstartdetails.invalid.jsp.summary-option2"> + <source> Alternatively you may associate a different distribution to this kickstart profile by visiting the <a href = "{0}">Kickstart Operating System Details</a> page.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/KickstartDetailsEdit</context> + </context-group> + </trans-unit> +<trans-unit id="kickstartdetails.advanced.invalid.jsp.summary-option2"> + <source> Alternatively you may associate a different distribution to this kickstart profile by selecting a distribution and choosing '{0}'.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/KickstartDetailsEdit</context> + </context-group> + </trans-unit> <trans-unit id="kickstartoptions.jsp.updatekickstart"> <source>Update Kickstart</source> <context-group name="ctx"> @@ -16455,16 +16481,22 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Acti <trans-unit id="kickstart.distro.sw_managed.jsp"> <source>@@PRODUCT_NAME@@ Managed?*</source> <context-group name="ctx"> - <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context> + <context context-type="sourcefile">/rhn/kickstart/Kickstarts.do</context> </context-group> - </trans-unit> + </trans-unit> <trans-unit id="kickstart.distro.label.jsp"> <source>Distribution</source> <context-group name="ctx"> - <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context> + <context context-type="sourcefile">/rhn/kickstart/Kickstarts.do</context> </context-group> </trans-unit>
+ <trans-unit id="kickstarts.profile.is-valid.tooltip"> + <source>Kickstart profiles may be associated to an invalid kickstart distribution. To make a kickstart profile valid please select the profile and modify its distribution appropriately.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/Kickstarts.do</context> + </context-group> + </trans-unit> <!--KS schedule pages --> <group> <context-group name="ctx"> @@ -16796,7 +16828,7 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Acti <source>Kickstart distributions may be invalid due wrong or non existent base path to the kernel or initrd image. To make your custom distribution valid please select the distribution and modify its base path appropriately.</source> </trans-unit> <trans-unit id="kickstart.distro.is-valid.jsp"> - <source>Valid?*</source> + <source>Valid</source> </trans-unit> </group>
@@ -20363,23 +20395,33 @@ given channel.</source> </trans-unit> <trans-unit id="docsearch.content"> <source>Content</source> + <context-group name="ctx"> <context context-type="sourcefile">/rhn/help/Search</context> + </context-group> </trans-unit> <trans-unit id="docsearch.free_form"> <source>Free Form</source> + <context-group name="ctx"> <context context-type="sourcefile">/rhn/help/Search</context> + </context-group> </trans-unit> <trans-unit id="docsearch.content_title"> <source>Content & Title</source> + <context-group name="ctx"> <context context-type="sourcefile">/rhn/help/Search</context> + </context-group> </trans-unit> <trans-unit id="docsearch.title"> <source>Title</source> + <context-group name="ctx"> <context context-type="sourcefile">/rhn/help/Search</context> + </context-group> </trans-unit> <trans-unit id="docsearch.jsp.summary"> <source>Summary</source> + <context-group name="ctx"> <context context-type="sourcefile">/rhn/help/Search</context> + </context-group> </trans-unit> <trans-unit id="docsearch.jsp.imgAlt"> <source>search</source> diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java index 07fd95f..58a4f08 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartDeleteCommand.java @@ -19,6 +19,8 @@ import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.kickstart.cobbler.CobblerProfileDeleteCommand;
+import org.apache.commons.lang.StringUtils; + /** * BaseKickstartDeleteCommand * @version $Rev$ @@ -43,12 +45,12 @@ public class KickstartDeleteCommand extends KickstartEditCommand { if (deleted == 0) { return new ValidatorError("kickstart.delete.error"); } - else { + else if (!StringUtils.isBlank(getKickstartData().getCobblerId())) { CobblerProfileDeleteCommand cmd = new CobblerProfileDeleteCommand(getKickstartData(), this.getUser()); cmd.store(); - return null; } + return null; }
} diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java index a695bb4..a0a45f5 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java @@ -288,8 +288,8 @@ public class KickstartEditCommand extends BaseKickstartCommand { * @return list of KickstartableTree instances */ public List getTrees(Long channelId, Org org) { - return KickstartFactory.lookupKickstartableTrees(channelId, - org); + return KickstartManager.getInstance(). + removeInvalid(KickstartFactory.lookupKickstartableTrees(channelId, org)); }
/** diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java index 854956a..d12b01d 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java @@ -18,6 +18,7 @@ import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.domain.kickstart.KickstartFactory; +import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.ActivationKeyDto; @@ -88,11 +89,22 @@ public class KickstartLister extends BaseManager { Map params = new HashMap(); params.put("org_id", orgIn.getId()); Map elabParams = new HashMap(); - DataResult returnDataResult = makeDataResult(params, elabParams, pc, m); + DataResult<KickstartDto> returnDataResult = makeDataResult(params, + elabParams, pc, m); if (logger.isDebugEnabled()) { logger.debug("kickstartsInOrg(Org, PageControl) - end - return value=" + returnDataResult); } + + Set<Long> ids = new HashSet<Long>(); + List<KickstartableTree> trees = KickstartManager.getInstance(). + removeInvalid(KickstartFactory.lookupAccessibleTreesByOrg(orgIn)); + for (KickstartableTree tree : trees) { + ids.add(tree.getId()); + } + for (KickstartDto dto : returnDataResult) { + dto.setValid(ids.contains(dto.getKstreeId())); + } return returnDataResult; }
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java index bccc6ba..4d8a5f8 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java @@ -24,6 +24,7 @@ import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.KickstartIpRange; +import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.server.NetworkInterface; import com.redhat.rhn.domain.server.Server; @@ -35,6 +36,7 @@ import com.redhat.rhn.manager.BaseManager; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map;
@@ -88,10 +90,13 @@ public class KickstartManager extends BaseManager { */ public void validateKickstartFile(KickstartData ksdata) { try { - String text = renderKickstart(ksdata); - if (text.contains("Traceback (most recent call last):")) { - ValidatorException.raiseException("kickstart.jsp.error.template_generation", - KickstartUrlHelper.getFileDowloadPageUrl(ksdata)); + if (ksdata.isValid()) { + String text = renderKickstart(ksdata); + if (text.contains("Traceback (most recent call last):")) { + ValidatorException. + raiseException("kickstart.jsp.error.template_generation", + KickstartUrlHelper.getFileDowloadPageUrl(ksdata)); + } } } catch (DownloadException de) { @@ -195,5 +200,20 @@ public class KickstartManager extends BaseManager { }
- + /** + * Accept a list of trees and only return those + * that are valid, as in they pass the isValid method + * @param trees the input list + * @return List of KickstartableTree objects + */ + public List<KickstartableTree> removeInvalid(List<KickstartableTree> trees) { + List<KickstartableTree> ret = new LinkedList<KickstartableTree>(trees); + for (Iterator<KickstartableTree> itr = ret.iterator(); itr.hasNext();) { + KickstartableTree tree = itr.next(); + if (!tree.isValid()) { + itr.remove(); + } + } + return ret; + } } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartWizardHelper.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartWizardHelper.java index e312d8a..e10fbf6 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartWizardHelper.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartWizardHelper.java @@ -26,7 +26,6 @@ import com.redhat.rhn.domain.kickstart.crypto.CryptoKey; import com.redhat.rhn.domain.rhnpackage.PackageFactory; import com.redhat.rhn.domain.rhnpackage.PackageName; import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.manager.kickstart.cobbler.CobblerDistroCommand; import com.redhat.rhn.manager.kickstart.cobbler.CobblerProfileCreateCommand;
import org.apache.log4j.Logger; @@ -36,7 +35,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.Map; import java.util.Set;
/** @@ -62,7 +60,9 @@ public class KickstartWizardHelper { * @return list of KickstartableTrees */ public List getKickstartableTrees() { - return KickstartFactory.lookupAccessibleTreesByOrg(currentUser.getOrg()); + return KickstartManager.getInstance(). + removeInvalid(KickstartFactory. + lookupAccessibleTreesByOrg(currentUser.getOrg())); }
/** @@ -128,36 +128,11 @@ public class KickstartWizardHelper { * @param channelId base channel * @return list of KickstartableTree instances */ - public List getTrees(Long channelId) { - List trees = KickstartFactory.lookupKickstartableTrees(channelId, - currentUser.getOrg()); - // Now we filter out an - List retval = new LinkedList(); - CobblerDistroCommand cmd = new CobblerDistroCommand(currentUser); - - List<Map> distros = cmd.getCobblerDistros(); - for (int i = 0; i < trees.size(); i++) { - KickstartableTree tree = (KickstartableTree) trees.get(i); - boolean hasCobblerDistro = false; - for (Map row : distros) { - log.debug("getDistroMap.ROW: " + row); - String uid = (String) row.get("uid"); - if (uid.equals(tree.getCobblerId())) { - log.debug("tree [" + tree.getLabel() + - "] has a cobbler distro. Display it."); - hasCobblerDistro = true; - } - } - if (hasCobblerDistro) { - retval.add(tree); - } - else { - log.error("This Kickstart tree " + - "does not have an associated " + - "cobbler distro: " + tree.getLabel()); - } - } - return retval; + public List<KickstartableTree> getTrees(Long channelId) { + return KickstartManager.getInstance(). + removeInvalid(KickstartFactory. + lookupKickstartableTrees(channelId, + currentUser.getOrg())); }
/** diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java index 2a8ebc0..bcd243e 100755 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java @@ -24,15 +24,11 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.integration.IntegrationService; import com.redhat.rhn.frontend.xmlrpc.util.XMLRPCInvoker;
-import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.cobbler.CobblerConnection;
-import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map;
import redstone.xmlrpc.XmlRpcFault;
@@ -135,8 +131,6 @@ public abstract class CobblerCommand { org.getName().replace(' ', '-')); }
- - /** * Makes a local file path out of the cobbler name. * @@ -159,7 +153,6 @@ public abstract class CobblerCommand { return retval; }
- /** * Make a cobbler name for a kickstartable tree * @param tree the tree @@ -177,77 +170,7 @@ public abstract class CobblerCommand { public static String makeCobblerName(KickstartData data) { return makeCobblerName(data.getLabel(), data.getOrg()); } - - /** - * Lookup a cobbler distro based on UID (cobbler_id) - * or on name if UID isn't available. - * @param tree the tree/distro to get a cobbler version of - * @return the cobbler distro as a map - */ - public Map lookupCobblerDistro(KickstartableTree tree) { - - if (StringUtils.isBlank(tree.getCobblerId())) { - return (Map) invokeXMLRPC("get_distro", - CobblerCommand.makeCobblerName(tree)); - } - - List<Map> distros = getCobblerDistros(); - for (Map row : distros) { - log.debug("getDistroMap.ROW: " + row); - String uid = (String) row.get("uid"); - if (uid.equals(tree.getCobblerId())) { - return row; - } - } - return new HashMap(); - } - - /** - * Get the list of cobbler distro objects. - * @return List of cobbler distros - */ - public List<Map> getCobblerDistros() { - List<String> args = new ArrayList(); - args.add(xmlRpcToken); - List<Map> distros = (List) invokeXMLRPC("get_distros", args); - return distros; - } - - /** - * lookup the cobbler profile map based on UID - * or on name if cobbler_id isn't available - * @param data the ks profile to get a cobbler map of - * @return the profile in map form - */ - public Map lookupCobblerProfile(KickstartData data) { - if (StringUtils.isBlank(data.getCobblerId())) { - return (Map) invokeXMLRPC("get_profile", - CobblerCommand.makeCobblerName(data)); - } - return lookupCobblerProfileByUid(data.getCobblerId()); - } - - - /** - * Lookup cobbler profile by a UID - * @param uid the uid (or cobblerID) to pull the profile with - * @return a Map consisting of the Cobbler id - */ - public Map lookupCobblerProfileByUid(String uid) { - List <String> args = new ArrayList(); - args.add(xmlRpcToken); - List<Map> profiles = (List) invokeXMLRPC("get_profiles", args); - for (Map row : profiles) { - log.debug("getProfileMap.ROW: " + row + - " looking for: " + uid); - String id = (String) row.get("uid"); - if (id != null && id.equals(uid)) { - return row; - } - } - return new HashMap(); - } - + protected void invokeCobblerUpdate() { invokeXMLRPC("update", xmlRpcToken); } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java index 6d378c7..6950ca3 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java @@ -63,15 +63,6 @@ public class CobblerDistroCommand extends CobblerCommand { }
/** - * Get the distribution associated with the current KickstartData - * @return Map of cobbler distro fields. - */ - public Map getDistroMap() { - log.debug("getDistroMap()"); - return lookupCobblerDistro(this.tree); - } - - /** * Copy cobbler fields that shouldn't change in cobbler */ protected void updateCobblerFields() { @@ -79,7 +70,6 @@ public class CobblerDistroCommand extends CobblerCommand { Distro nonXen = Distro.lookupById(con, tree.getCobblerId()); Distro xen = Distro.lookupById(con, tree.getCobblerXenId());
- Map ksmeta = new HashMap(); KickstartUrlHelper helper = new KickstartUrlHelper(this.tree); ksmeta.put(KickstartUrlHelper.COBBLER_MEDIA_VARIABLE, diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java index e7a2e39..e24207c 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCreateCommand.java @@ -32,7 +32,7 @@ import java.util.Map; public class CobblerDistroCreateCommand extends CobblerDistroCommand {
private static Logger log = Logger.getLogger(CobblerDistroCreateCommand.class); - + private boolean syncProfiles; /** * Constructor * @param ksTreeIn to sync @@ -51,6 +51,20 @@ public class CobblerDistroCreateCommand extends CobblerDistroCommand { super(ksTreeIn, userIn); }
+ /** + * Constructor + * @param ksTreeIn to sync + * @param userIn - user wanting to sync with cobbler + * @param syncProfilesIn - true if you want the distro command + * to run a CobblerProfileSync + * when storing. + */ + public CobblerDistroCreateCommand(KickstartableTree ksTreeIn, + User userIn, boolean syncProfilesIn) { + this(ksTreeIn, userIn); + syncProfiles = syncProfilesIn; + } + /** * Save the Cobbler profile to cobbler. * @return ValidatorError if there was a problem @@ -79,6 +93,11 @@ public class CobblerDistroCreateCommand extends CobblerDistroCommand { tree.getInitrdXenPath(), ksmeta); tree.setCobblerXenId(distroXen.getUid()); } + + if (syncProfiles) { + CobblerProfileSyncCommand syncer = new CobblerProfileSyncCommand(); + syncer.store(); + } return null; }
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroDeleteCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroDeleteCommand.java index d3a23a1..9f58076 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroDeleteCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroDeleteCommand.java @@ -18,6 +18,7 @@ import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.kickstart.KickstartableTree; import com.redhat.rhn.domain.user.User;
+import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.cobbler.CobblerConnection; import org.cobbler.Distro; @@ -50,8 +51,12 @@ public class CobblerDistroDeleteCommand extends CobblerDistroCommand { */ @Override public ValidatorError store() { - CobblerConnection con = CobblerXMLRPCHelper.getConnection(user); + //Upgrade Scenario where a cobbler id will be null + if (StringUtils.isBlank(tree.getCobblerId())) { + return null; + }
+ CobblerConnection con = CobblerXMLRPCHelper.getConnection(user); Distro dis = Distro.lookupById(con, tree.getCobblerId());
if (dis == null) { diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java index 5928490..6a7d25b 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCommand.java @@ -67,16 +67,6 @@ public abstract class CobblerProfileCommand extends CobblerCommand { this.ksData = ksDataIn; }
- - /** - * Get the Cobbler profile associated with this KickstartData - * @return Map of Cobbler profile fields. - */ - public Map getProfileMap() { - return lookupCobblerProfile(this.ksData); - } - - protected void updateCobblerFields(Profile profile) { profile.setDistro(getDistroForKickstart()); if (kernelOptions != null) { diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileDeleteCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileDeleteCommand.java index 419e5b0..06d6311 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileDeleteCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileDeleteCommand.java @@ -19,8 +19,7 @@ import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.user.User;
import org.apache.log4j.Logger; - -import java.util.Map; +import org.cobbler.Profile;
/** * KickstartCobblerCommand - class to contain logic to communicate with cobbler @@ -48,16 +47,12 @@ public class CobblerProfileDeleteCommand extends CobblerProfileCommand { @Override public ValidatorError store() { // No need to delete if it doesnt exist in cobbler - Map profile = this.getProfileMap(); - if (profile == null || profile.isEmpty()) { + Profile profile = ksData.getCobblerObject(user); + if (profile == null) { log.warn("No cobbler profile associated with this Profile."); return null; } - - Boolean rc = (Boolean) invokeXMLRPC("remove_profile", - profile.get("name"), xmlRpcToken); - log.debug("RC: " + rc); - if (rc == null || !rc.booleanValue()) { + if (!profile.remove()) { return new ValidatorError("cobbler.profile.remove_failed"); } invokeCobblerUpdate(); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java index c248128..f183653 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileEditCommand.java @@ -18,6 +18,7 @@ import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.user.User;
+import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.cobbler.Profile;
@@ -26,9 +27,6 @@ import org.cobbler.Profile; * @version $Rev$ */ public class CobblerProfileEditCommand extends CobblerProfileCommand { - - - private static Logger log = Logger.getLogger(CobblerProfileEditCommand.class);
/** @@ -45,7 +43,9 @@ public class CobblerProfileEditCommand extends CobblerProfileCommand { * {@inheritDoc} */ public ValidatorError store() { - log.debug("ProfileMap: " + this.getProfileMap()); + if (StringUtils.isBlank(ksData.getCobblerId())) { + return new CobblerProfileCreateCommand(ksData, user).store(); + }
String cobName = makeCobblerName(ksData);
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java index a1a70be..853dd7b 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java @@ -71,7 +71,7 @@ public class CobblerSystemCreateCommand extends CobblerCommand { this.server = serverIn; this.mediaPath = mediaPathIn; if (ksDataIn != null) { - profileName = (String)lookupCobblerProfile(ksDataIn).get("name"); + profileName = ksDataIn.getCobblerObject(user).getName(); } else { throw new NullPointerException("ksDataIn cant be null"); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java index 6983f77..37ab33d 100755 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/test/CobblerCommandTest.java @@ -36,8 +36,6 @@ import com.redhat.rhn.testing.ServerTestUtils; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils;
-import java.util.Map; - /** * CobblerCommandTest */ @@ -94,9 +92,8 @@ public class CobblerCommandTest extends BaseTestCaseWithUser { CobblerProfileCreateCommand cmd = new CobblerProfileCreateCommand( ksdata, user); assertNull(cmd.store()); - Map profile = cmd.getProfileMap(); - assertNotNull(profile); - assertNotNull(profile.get("name")); + assertNotNull(ksdata.getCobblerObject(user)); + assertNotNull(ksdata.getCobblerObject(user).getName()); }
public void testProfileEdit() throws Exception { @@ -111,9 +108,7 @@ public class CobblerCommandTest extends BaseTestCaseWithUser { String newName = "some-new-name-" + System.currentTimeMillis(); ksdata.setLabel(newName); assertNull(pec.store()); - Map profile = pec.getProfileMap(); - String profileName = (String) profile.get("name"); - assertNotNull(profileName); + assertNotNull(ksdata.getCobblerObject(user).getName()); }
public void testProfileDelete() throws Exception { @@ -123,16 +118,16 @@ public class CobblerCommandTest extends BaseTestCaseWithUser {
CobblerProfileDeleteCommand cmd = new CobblerProfileDeleteCommand(ksdata, user); assertNull(cmd.store()); - assertTrue(cmd.getProfileMap().isEmpty()); + assertNull(ksdata.getCobblerObject(user)); }
public void testDistroCreate() throws Exception { CobblerDistroCreateCommand cmd = new CobblerDistroCreateCommand(ksdata.getTree(), user); assertNull(cmd.store()); - assertNotNull(cmd.getDistroMap()); - Map ksmeta = (Map) cmd.getDistroMap().get("ksmeta"); - assertNotNull(ksmeta.get(KickstartUrlHelper.COBBLER_MEDIA_VARIABLE)); + assertNotNull(ksdata.getTree().getCobblerObject(user)); + assertNotNull(ksdata.getTree().getCobblerObject(user). + getKsMeta().get(KickstartUrlHelper.COBBLER_MEDIA_VARIABLE)); }
@@ -148,9 +143,8 @@ public class CobblerCommandTest extends BaseTestCaseWithUser { String newName = TestUtils.randomString(); ksdata.getKickstartDefaults().getKstree().setLabel(newName); assertNull(cmd.store()); - Map distro = cmd.getDistroMap(); - String distroName = (String) distro.get("name"); - assertNotNull(distroName); + assertNotNull(ksdata.getTree().getCobblerObject(user)); + assertNotNull(ksdata.getTree().getCobblerObject(user).getName()); }
public void testLogin() throws Exception { diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/tree/BaseTreeEditOperation.java b/java/code/src/com/redhat/rhn/manager/kickstart/tree/BaseTreeEditOperation.java index 801a0d7..28f99ac 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/tree/BaseTreeEditOperation.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/tree/BaseTreeEditOperation.java @@ -16,6 +16,7 @@ package com.redhat.rhn.manager.kickstart.tree;
import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.common.validator.ValidatorError; +import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.channel.ChannelVersion; @@ -34,6 +35,7 @@ import com.redhat.rhn.manager.rhnpackage.PackageManager; import org.cobbler.Distro; import org.cobbler.XmlRpcException;
+import java.io.File; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -47,7 +49,8 @@ import java.util.regex.Pattern; * @version $Rev$ */ public abstract class BaseTreeEditOperation extends BasePersistOperation { - + private static final String INVALID_INITRD = "kickstart.tree.invalidinitrd"; + private static final String INVALID_KERNEL = "kickstart.tree.invalidkernel"; protected KickstartableTree tree; private static final String EMPTY_STRING = ""; public static final String KICKSTART_CAPABILITY = "rhn.kickstart.boot_image"; @@ -82,10 +85,18 @@ public abstract class BaseTreeEditOperation extends BasePersistOperation { return new ValidatorError("kickstart.tree.invalidlabel"); }
+ try { + validateBasePath(); + } + catch (ValidatorException ve) { + return ve.getResult().getErrors().get(0); + } + KickstartFactory.saveKickstartableTree(this.tree); // Sync to cobbler try { - getCobblerCommand().store(); + CobblerCommand command = getCobblerCommand(); + command.store();
Distro distro = Distro.lookupById(CobblerXMLRPCHelper.getConnection( this.getUser()), tree.getCobblerId()); @@ -93,37 +104,34 @@ public abstract class BaseTreeEditOperation extends BasePersistOperation { Map kOpts = distro.getKernelOptions(); distro.setKernelOptions(getKernelOptions()); distro.setKernelPostOptions(getPostKernelOptions()); - distro.save(); - - } catch (XmlRpcException xe) { HibernateFactory.rollbackTransaction(); if (xe.getCause().getMessage().contains("kernel not found")) { - return new ValidatorError("kickstart.tree.invalidkernel", + return new ValidatorError(INVALID_KERNEL, this.tree.getKernelPath()); } else if (xe.getCause().getMessage().contains("initrd not found")) { - return new ValidatorError("kickstart.tree.invalidinitrd", + return new ValidatorError(INVALID_INITRD, this.tree.getInitrdPath()); } else { - throw new RuntimeException(xe.getCause()); - } + throw new RuntimeException(xe.getCause()); + } } catch (Exception e) { HibernateFactory.rollbackTransaction(); if (e.getMessage().contains("kernel not found")) { - return new ValidatorError("kickstart.tree.invalidkernel", + return new ValidatorError(INVALID_KERNEL, this.tree.getKernelPath()); } else if (e.getMessage().contains("initrd not found")) { - return new ValidatorError("kickstart.tree.invalidinitrd", + return new ValidatorError(INVALID_INITRD, this.tree.getInitrdPath()); } else { - throw new RuntimeException(e); + throw new RuntimeException(e); }
} @@ -145,7 +153,21 @@ public abstract class BaseTreeEditOperation extends BasePersistOperation { return matcher.matches(); }
- + private void validatePathExists(String path, String key) { + if (!(new File(path).exists())) { + ValidatorException.raiseException(key, path); + } + } + /** + * Ensures that the base path is correctly setup.. + * As in the initrd and kernel structures are setup correctly. + * @throws ValidatorException if those paths don;t exist + */ + public void validateBasePath() throws ValidatorException { + validatePathExists(getTree().getInitrdPath(), INVALID_INITRD); + validatePathExists(getTree().getKernelPath(), INVALID_KERNEL); + } + /** * @return Returns the tree. */ diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeEditOperation.java b/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeEditOperation.java index 21b1757..0bf53d8 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeEditOperation.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/tree/TreeEditOperation.java @@ -17,8 +17,11 @@ package com.redhat.rhn.manager.kickstart.tree; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.kickstart.cobbler.CobblerCommand; +import com.redhat.rhn.manager.kickstart.cobbler.CobblerDistroCreateCommand; import com.redhat.rhn.manager.kickstart.cobbler.CobblerDistroEditCommand;
+import org.apache.commons.lang.StringUtils; + /** * TreeEditCommand to edit a KickstartableTree * @version $Rev$ @@ -59,6 +62,9 @@ public class TreeEditOperation extends BaseTreeEditOperation { * {@inheritDoc} */ protected CobblerCommand getCobblerCommand() { + if (StringUtils.isBlank(tree.getCobblerId())) { + return new CobblerDistroCreateCommand(tree, user, true); + } return new CobblerDistroEditCommand(this.tree, this.user); }
diff --git a/java/code/src/org/cobbler/test/MockConnection.java b/java/code/src/org/cobbler/test/MockConnection.java index 87e95bf..1c511b7 100644 --- a/java/code/src/org/cobbler/test/MockConnection.java +++ b/java/code/src/org/cobbler/test/MockConnection.java @@ -102,6 +102,10 @@ public class MockConnection extends CobblerConnection { return random(); }
+ if (name.startsWith("modify_") && "ksmeta".equals(args[1])) { + args[1] = "ks_meta"; + } + //profiles: if ("get_profiles".equals(name)) { return profiles; diff --git a/java/code/webapp/WEB-INF/nav/kickstart_details.xml b/java/code/webapp/WEB-INF/nav/kickstart_details.xml index 10478dc..d8783e2 100644 --- a/java/code/webapp/WEB-INF/nav/kickstart_details.xml +++ b/java/code/webapp/WEB-INF/nav/kickstart_details.xml @@ -1,64 +1,64 @@ <?xml version="1.0"?> <rhn-navi-tree label="kickstart_detail" invisible="1" formvar="ksid" title-depth="1" acl_mixins="com.redhat.rhn.common.security.acl.KickstartAclHandler"> - <rhn-tab name="Kickstart Details" > + <rhn-tab name="Kickstart Details" acl="user_role(config_admin)" > <rhn-tab-url>/rhn/kickstart/KickstartDetailsEdit.do</rhn-tab-url> <rhn-tab name="Details" > <rhn-tab-url>/rhn/kickstart/KickstartDetailsEdit.do</rhn-tab-url> <rhn-tab-url>/rhn/kickstart/KickstartClone.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="Operating System"> + <rhn-tab name="Operating System" acl="user_role(config_admin)"> <rhn-tab-url>/rhn/kickstart/KickstartSoftwareEdit.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="kickstart.variable.nav"> + <rhn-tab name="kickstart.variable.nav" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/EditVariables.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="Advanced Options"> + <rhn-tab name="Advanced Options" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/KickstartOptionsEdit.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="Bare Metal Kickstart"> + <rhn-tab name="Bare Metal Kickstart" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/KickstartIpRangeEdit.do</rhn-tab-url> </rhn-tab> </rhn-tab> - <rhn-tab name="System Details"> + <rhn-tab name="System Details" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/SystemDetailsEdit.do</rhn-tab-url> <rhn-tab name="Details"> <rhn-tab-url>/rhn/kickstart/SystemDetailsEdit.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="Locale"> + <rhn-tab name="Locale" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/Locale.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="Partitioning"> + <rhn-tab name="Partitioning" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/KickstartPartitionEdit.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="File Preservation"> + <rhn-tab name="File Preservation" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/KickstartFilePreservationLists.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="GPG_SSL"> + <rhn-tab name="GPG_SSL" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/KickstartCryptoKeysList.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="Troubleshooting"> + <rhn-tab name="Troubleshooting" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/Troubleshooting.do</rhn-tab-url> </rhn-tab> </rhn-tab> - <rhn-tab name="Software" > + <rhn-tab name="Software" acl="user_role(config_admin);profile_is_valid()" > <rhn-tab-url>/rhn/kickstart/KickstartPackagesEdit.do</rhn-tab-url> <rhn-tab name="Package Groups"> <rhn-tab-url>/rhn/kickstart/KickstartPackagesEdit.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="Package Profiles"> + <rhn-tab name="Package Profiles" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/KickstartPackageProfileEdit.do</rhn-tab-url> </rhn-tab> </rhn-tab> - <rhn-tab name="Activation Keys" > + <rhn-tab name="Activation Keys" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/ActivationKeysList.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="Scripts" > + <rhn-tab name="Scripts" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/Scripts.do</rhn-tab-url> <rhn-tab-url>/rhn/kickstart/KickstartScriptEdit.do</rhn-tab-url> <rhn-tab-url>/rhn/kickstart/KickstartScriptCreateEdit.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="Kickstart File" > + <rhn-tab name="Kickstart File" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/KickstartFileDownload.do</rhn-tab-url> </rhn-tab> </rhn-navi-tree> diff --git a/java/code/webapp/WEB-INF/nav/kickstart_raw_mode.xml b/java/code/webapp/WEB-INF/nav/kickstart_raw_mode.xml index ab5123a..6db783b 100644 --- a/java/code/webapp/WEB-INF/nav/kickstart_raw_mode.xml +++ b/java/code/webapp/WEB-INF/nav/kickstart_raw_mode.xml @@ -4,13 +4,13 @@ <rhn-tab name="Details" acl="user_role(config_admin)"> <rhn-tab-url>/rhn/kickstart/AdvancedModeEdit.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="Bare Metal Kickstart"> + <rhn-tab name="Bare Metal Kickstart" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/KickstartIpRangeEditAdvanced.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="kickstart.variable.nav" acl="user_role(config_admin)"> + <rhn-tab name="kickstart.variable.nav" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/EditVariables.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="Kickstart File" acl="user_role(config_admin)"> + <rhn-tab name="Kickstart File" acl="user_role(config_admin);profile_is_valid()"> <rhn-tab-url>/rhn/kickstart/KickstartFileDownloadAdvanced.do</rhn-tab-url> </rhn-tab>
diff --git a/java/code/webapp/WEB-INF/nav/kickstart_tree_details.xml b/java/code/webapp/WEB-INF/nav/kickstart_tree_details.xml index ba4f036..4c83ea7 100644 --- a/java/code/webapp/WEB-INF/nav/kickstart_tree_details.xml +++ b/java/code/webapp/WEB-INF/nav/kickstart_tree_details.xml @@ -1,10 +1,10 @@ <?xml version="1.0"?> <rhn-navi-tree label="kickstart_tree" invisible="1" formvar="kstid" title-depth="1" - acl_mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler"> + acl_mixins="com.redhat.rhn.common.security.acl.ConfigAclHandler,com.redhat.rhn.common.security.acl.KickstartAclHandler"> <rhn-tab name="kickstart.tree.edit.nav" acl="user_role(config_admin)"> <rhn-tab-url>/rhn/kickstart/TreeEdit.do</rhn-tab-url> </rhn-tab> - <rhn-tab name="kickstart.variable.nav" acl="user_role(config_admin)"> + <rhn-tab name="kickstart.variable.nav" acl="user_role(config_admin); tree_is_synced()"> <rhn-tab-url>/rhn/kickstart/tree/EditVariables.do</rhn-tab-url> </rhn-tab> </rhn-navi-tree> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf index b334c36..f813202 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf @@ -3,6 +3,8 @@ <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> <%@ include file="/WEB-INF/pages/common/fragments/editarea.jspf" %> + <c:choose> + <c:when test="${empty requestScope.invalid}"> <html:form styleId="wizard-form" method="post" action="${param.url}" enctype="multipart/form-data"> @@ -104,4 +106,43 @@ <input type="hidden" name="ksid" value="${param.ksid}"/> </c:if> </div> - </html:form> \ No newline at end of file + </html:form> + </c:when> + <c:when test="${empty requestScope.create}"> + <p><bean:message key="kickstartdetails.invalid.jsp.summary"/> + <bean:message key="kickstartdetails.invalid.jsp.summary-option1" + arg0="${ksdata.tree.label}" + arg1="/rhn/kickstart/TreeEdit.do?kstid=${ksdata.tree.id}"/></p> + <p><bean:message key="kickstartdetails.advanced.invalid.jsp.summary-option2" + arg0="${rhn:localize(param.action_key)}"/></p> + + <html:form styleId="wizard-form" method="post" action="${param.url}"> + <table class="details"> + <tr> + <th><rhn:required-field key="kickstart.jsp.create.wizard.kstree.label"/>:</th> + <td> + <c:choose> + <c:when test="${notrees == null}"> + <html:select property="kstreeId"> + <html:optionsCollection property="kstrees" label="label" value="id" /> + </html:select> + </c:when> + <c:otherwise> + <b><bean:message key="kickstart.edit.software.notrees.jsp" /></b> + </c:otherwise> + </c:choose> + </td> + </tr> + <div align="right"> + </table> + <hr /> + <html:submit property="dispatch"> + <bean:message key="${param.action_key}"/> + </html:submit> + </div> + rhn:submitted/ + <input type="hidden" name="ksid" value="${param.ksid}"/> + </html:form> + </c:when> + </c:choose> + \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp index e8f40ae..a6ed6f4 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp @@ -12,16 +12,13 @@ renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
<h2><bean:message key="kickstartdetails.jsp.header2"/></h2> - - - <div> +<c:choose><c:when test="${empty requestScope.invalid}"> <bean:message key="kickstartdetails.jsp.summary1"/> <html:form method="post" action="/kickstart/KickstartDetailsEdit.do"> <html:hidden property="ksid" value="${ksdata.id}"/> <html:hidden property="submitted" value="true"/> <table class="details"> - <tr> <th><rhn:required-field key="kickstartdetails.jsp.label"/>:</th> <td><html:text property="label" maxlength="64" size="32" /><br/> @@ -35,9 +32,6 @@
<%@ include file="/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf" %>
- - - <tr> <th><bean:message key="kickstartdetails.jsp.active"/></th> <td> @@ -89,6 +83,16 @@ </tr> </table> </html:form> + </c:when> + <c:otherwise> + <p><bean:message key="kickstartdetails.invalid.jsp.summary"/> + <bean:message key="kickstartdetails.invalid.jsp.summary-option1" + arg0="${ksdata.tree.label}" + arg1="/rhn/kickstart/TreeEdit.do?kstid=${ksdata.tree.id}"/></p> + <p><bean:message key="kickstartdetails.invalid.jsp.summary-option2" + arg0="/rhn/kickstart/KickstartSoftwareEdit.do?ksid=${ksdata.id}"/></p> + </c:otherwise> + </c:choose> </div>
</body> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp index 1afa501..de3f3f0 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstarts.jsp @@ -24,12 +24,9 @@ <rl:list dataset="pageList" name="ksList" emptykey="kickstart.jsp.nokickstarts" alphabarcolumn="label" filter="com.redhat.rhn.frontend.action.kickstart.KickstartProfileFilter"> - <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="PageSizeDecorator"/> - - - <rl:column sortable="true" + <rl:column bound="false" headerkey="kickstart.jsp.label" sortattr="label" @@ -51,7 +48,7 @@ ** </c:if> </rl:column> - <rl:column sortable="true" bound="false" headerkey="kickstart.jsp.active" sortattr="active"> + <rl:column bound="false" headerkey="kickstart.jsp.active" sortattr="active"> <c:if test="${current.active}"> <img src="/img/rhn-listicon-ok.gif" alt="<bean:message key="kickstart.jsp.active"/>" title="<bean:message key="kickstart.jsp.active"/>"/> @@ -61,10 +58,10 @@ title="<bean:message key="kickstart.jsp.inactive"/>"/> </c:if> </rl:column> - <rl:column headerkey="kickstart.distro.label.jsp"> + <rl:column headerkey="kickstart.distro.label.jsp" sortattr="treeLabel"> <c:out value="${current.treeLabel}"/> </rl:column> - <rl:column headerkey="kickstart.distro.sw_managed.jsp" styleclass="last-column"> + <rl:column headerkey="kickstart.distro.sw_managed.jsp" sortattr="cobbler"> <c:choose> <c:when test="${current.cobbler}"> <img src="/img/rhn-listicon-error.gif"> @@ -74,6 +71,16 @@ </c:otherwise> </c:choose> </rl:column> + <rl:column headertext="${rhn:localize('kickstart.distro.is-valid.jsp')}?***" sortattr="valid" styleclass="last-column"> + <c:choose> + <c:when test="${current.valid}"> + <img src="/img/rhn-listicon-checked.gif"> + </c:when> + <c:otherwise> + <img src="/img/rhn-listicon-error.gif"> + </c:otherwise> + </c:choose> + </rl:column> </rl:list>
</rl:listset> @@ -82,6 +89,7 @@ <c:if test="${not empty requestScope.orgDefaultExists}"> <p>rhn:tooltip** - <bean:message key="kickstart.list.jsp.orgdefault"/></rhn:tooltip></p> </c:if> + <p>rhn:tooltip***-<bean:message key="kickstarts.profile.is-valid.tooltip"/></rhn:tooltip></p>
</body> </html:html> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp index 63e7530..c96e73d 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp @@ -37,7 +37,7 @@ <rl:column bound="false" headerkey="softwareedit.jsp.basechannel" sortattr="channel"> ${current.channel.name} </rl:column> - <rl:column headerkey="kickstart.distro.is-valid.jsp" sortattr="valid" styleclass="last-column"> + <rl:column headertext="${rhn:localize('kickstart.distro.is-valid.jsp')}?*" sortattr="valid" styleclass="last-column"> <c:choose> <c:when test="${current.valid}"> <img src="/img/rhn-listicon-checked.gif">
commit e5fc1fb0cc3f2031b76d133a083b00d75573dc00 Author: Shannon Hughes shughes@redhat.com Date: Fri Jul 17 11:58:10 2009 -0400
509409 - rewrote package file naming when pushed from proxy
diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java index 1e884a6..feb20bd 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/Package.java @@ -14,6 +14,15 @@ */ package com.redhat.rhn.domain.rhnpackage;
+import java.util.Date; +import java.util.HashSet; +import java.util.Set; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; + import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.domain.BaseDomainHelper; import com.redhat.rhn.domain.channel.Channel; @@ -22,15 +31,6 @@ import com.redhat.rhn.domain.errata.impl.UnpublishedErrata; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.rpm.SourceRpm;
-import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; - -import java.util.Date; -import java.util.HashSet; -import java.util.Set; - /** * Package * @version $Rev$ @@ -662,9 +662,20 @@ public class Package extends BaseDomainHelper { public String getFilename() { String pkgFile = getFile(); if (pkgFile == null) { - pkgFile = getPackageName().getName() + "-" + getPackageEvr().getVersion() + - "-" + getPackageEvr().getRelease() + "." + - getPackageArch().getArchType().getLabel() + ".rpm"; + StringBuffer buf = new StringBuffer(); + buf.append(getPackageName().getName()); + buf.append("-"); + buf.append(getPackageEvr().getVersion()); + buf.append("-"); + buf.append(getPackageEvr().getRelease()); + buf.append("."); + if (getPackageEvr().getEpoch() != null) { + buf.append(getPackageEvr().getEpoch() + "."); + } + buf.append(getPackageArch().getLabel()); + buf.append("."); + buf.append(getPackageArch().getArchType().getLabel()); + pkgFile = buf.toString(); } return pkgFile; }
commit bc8bf56117970fba635eddc1d9dafb3074c80936 Author: Justin Sherrill jsherril@redhat.com Date: Thu Jul 16 18:04:24 2009 -0400
510785 - modifying query to now show profiles on provisioning schedule pages if the profiles cobbler id is null
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml index 1c82147..6661e89 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml @@ -52,6 +52,7 @@ ORDER BY UPPER(C.name) AND ( C.channel_arch_id = :prim_arch_id OR C.channel_arch_id = :sec_arch_id ) AND ( KVT.label != 'xenpv' OR KVT.label IS NULL) + AND KS.cobbler_id IS NOT NULL ORDER BY KS.label, KS.id </query> </mode> @@ -70,6 +71,7 @@ ORDER BY KS.label, KS.id AND ( C.channel_arch_id = :prim_arch_id OR C.channel_arch_id = :sec_arch_id ) AND KSD.virtualization_type = KVT.id AND KVT.label not in ('none','para_host') + AND KS.cobbler_id IS NOT NULL ORDER BY KS.label, KS.id </query> </mode>
commit 930cbb8741610c93f286221284b27a0ba74332f1 Author: Justin Sherrill jsherril@redhat.com Date: Thu Jul 16 16:55:24 2009 -0400
512224 - improving handling of invalid network interfaces when adding them to cobbler
diff --git a/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java b/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java index 8d68162..42dba00 100644 --- a/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java +++ b/java/code/src/com/redhat/rhn/domain/server/NetworkInterface.java @@ -15,7 +15,9 @@ package com.redhat.rhn.domain.server;
import com.redhat.rhn.domain.BaseDomainHelper; +import com.redhat.rhn.manager.kickstart.IpAddress;
+import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -184,4 +186,28 @@ public class NetworkInterface extends BaseDomainHelper implements }
+ private boolean isIpValid() { + try { + IpAddress ip = new IpAddress(this.getIpaddr()); + return true; + } + catch (Exception e) { + return false; + } + } + + private boolean isMacValid() { + return !(StringUtils.isEmpty(this.getHwaddr()) || + this.getHwaddr().equals("00:00:00:00:00:00") || + this.getHwaddr().equals("fe:ff:ff:ff:ff:ff")); + } + + /** + * Returns if this network interface is valid and should be used + * @return true if valid, else false + */ + public boolean isValid() { + return isIpValid() && isMacValid(); + } + } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/IpAddress.java b/java/code/src/com/redhat/rhn/manager/kickstart/IpAddress.java index 8ced2c1..df59ccf 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/IpAddress.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/IpAddress.java @@ -42,6 +42,10 @@ public class IpAddress { */ public IpAddress(String ipIn) { this(); + if (StringUtils.isEmpty(ipIn)) { + throw new InvalidIpAddressException(StringUtils.defaultString(ipIn)); + } + String [] soctets = StringUtils.split(ipIn, "."); if (soctets.length == 4) { try { diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java index 721161d..a1a70be 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java @@ -157,11 +157,7 @@ public class CobblerSystemCreateCommand extends CobblerCommand { List macs = new LinkedList(); for (NetworkInterface n : server.getNetworkInterfaces()) { // Skip localhost and non real interfaces - if (n.getHwaddr() == null || - n.getHwaddr().equals("00:00:00:00:00:00") || - n.getHwaddr().equals("fe:ff:ff:ff:ff:ff") || - n.getIpaddr() == null || - n.getIpaddr().equals("127.0.0.1")) { + if (!n.isValid()) { log.debug("Skipping. not a real interface"); } else { @@ -309,7 +305,7 @@ public class CobblerSystemCreateCommand extends CobblerCommand { Server serverIn) { Map inet = new HashMap(); for (NetworkInterface n : serverIn.getNetworkInterfaces()) { - if (!n.getHwaddr().equals("00:00:00:00:00:00")) { + if (n.isValid()) { inet.put("macaddress-" + n.getName(), n.getHwaddr()); if (!StringUtils.isBlank(n.getIpaddr())) { inet.put("ipaddress-" + n.getName(), n.getIpaddr());
commit 6e56af40b4e978897e808ece8e44e772c146d89c Author: Pradeep Kilambi pkilambi@redhat.com Date: Thu Jul 16 15:59:39 2009 -0400
Automatic commit of package [spacewalk-backend] release [0.6.19-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 91eaab6..8a7f5a4 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 0.6.18 +Version: 0.6.19 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -568,6 +568,17 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$ %changelog +* Thu Jul 16 2009 Pradeep Kilambi pkilambi@redhat.com 0.6.19-1 +- 512236 - the org id checks were defaulting to None in custom channel cases + instead of 1. Also the metadata sting frommaster is a string None so we need + to check for the string. This should fix both custom and null org content in + iss case. hosted syncs should work as usual. (pkilambi@redhat.com) +- Return config channels sorted highest to lowest priority. + (dgoodwin@redhat.com) +- 511116 - changing updatePackages to change the permissions on the kickstart + trees in the same way we do for packages within /var/satellite + (jsherril@redhat.com) + * Fri Jul 10 2009 Pradeep Kilambi pkilambi@redhat.com 0.6.18-1 - If not commandline options given, compare the erratum channels to the already imported ones (pkilambi@redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 623b7fc..3ded2a7 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.18-1 backend/ +0.6.19-1 backend/
commit 4e0e20335b3d6d4e38e09178ace3103e4cb8cf25 Author: Miroslav Suchý msuchy@redhat.com Date: Thu Jul 16 21:57:30 2009 +0200
Automatic commit of package [spacewalk-schema] release [0.6.13-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index da2ac22..4b9b8f3 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -0.6.12-1 schema/spacewalk/ +0.6.13-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index e4e85b2..eac9ac9 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -2,7 +2,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server
-Version: 0.6.12 +Version: 0.6.13 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-schema-upgrade*
%changelog +* Thu Jul 16 2009 Miroslav Suchy msuchy@redhat.com 0.6.13-1 +- 512104 - add sshbannerignore parametr to existing probes which use ssh + * Mon Jul 06 2009 John Matthews jmatthew@redhat.com 0.6.12-1 - 509029 - schema/upgrade - update the text used for action type = kickstart_guest.initiate (bbuckingham@redhat.com)
commit 692b8ce5844a0bdf48ee774bd77bacbcc0e780fd Author: Miroslav Suchý msuchy@redhat.com Date: Thu Jul 16 21:51:24 2009 +0200
512104 - add sshbannerignore parametr to existing probes which use ssh
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/124-rhn_probe_param_value.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/124-rhn_probe_param_value.sql new file mode 100644 index 0000000..523c358 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/124-rhn_probe_param_value.sql @@ -0,0 +1,27 @@ +DECLARE + type result_type is record ( + probe_id NUMBER, + command_id NUMBER + ); + one_row result_type; +BEGIN +FOR one_row IN ( + select probe_id, command_id from rhn_probe_param_value + where + command_id in (25, 26, 27, 28, 29, 30, 31, 99, 105, 106, 107, 109, 117, 118, 123, 226, 228, 230, 249, 274, 304) + group by probe_id, command_id + having (probe_id, command_id) not in ( + select probe_id, command_id from rhn_probe_param_value where + command_id in (25, 26, 27, 28, 29, 30, 31, 99, 105, 106, 107, 109, 117, 118, 123, 226, 228, 230, 249, 274, 304) + AND param_name = 'sshbannerignore' + ) + ) +LOOP + insert into rhn_probe_param_value + (probe_id, command_id, param_name, value, last_update_user, last_update_date) values + (one_row.probe_id, one_row.command_id, 'sshbannerignore', '0', 'upgrade', SYSDATE()); +END LOOP; +END; +/ + +commit;
commit 04255751b7dd516854f9679d3bb5285752b839c4 Author: Justin Sherrill jsherril@redhat.com Date: Thu Jul 16 15:51:11 2009 -0400
510785 - updating cobbler sync tasks to ignore kickstarts and trees when the tree is not able to be synced to cobbler
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroSyncCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroSyncCommand.java index dfbddd6..9174ea2 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroSyncCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroSyncCommand.java @@ -72,6 +72,12 @@ public class CobblerDistroSyncCommand extends CobblerCommand { List<KickstartableTree> unSynced = KickstartFactory.listUnsyncedKickstartTrees(); String err; for (KickstartableTree tree : unSynced) { + + if (!tree.isValid()) { + log.warn("Could not sync tree " + tree.getLabel()); + continue; + } + Distro distro = Distro.lookupByName( CobblerXMLRPCHelper.getAutomatedConnection(), tree.getCobblerDistroName()); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java index 83edac3..a9f8b53 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileSyncCommand.java @@ -75,8 +75,16 @@ public class CobblerProfileSyncCommand extends CobblerCommand { Map<String, Map> profileNames = getModifiedProfileNames(); for (KickstartData profile : profiles) { if (!profileNames.containsKey(profile.getCobblerId())) { - createProfile(profile); - profile.setModified(new Date()); + if (profile.getKickstartDefaults().getKstree().getCobblerId() != null) { + log.warn("Kickstart profile " + profile.getLabel() + + " could not be synced to cobbler, due to it's " + + "tree being unsynced. Please edit the tree url " + + "to correct this."); + } + else { + createProfile(profile); + profile.setModified(new Date()); + } } }
commit a507b500abb55acf19655b7df40b62c78dc94988 Author: Partha Aji paji@redhat.com Date: Thu Jul 16 15:27:06 2009 -0400
510299 - static ks fix.
Basically spacewalk koan did ifconfig $DEVICE | perl -lne '/Mask:([\d.]+)/ and print $1'" instead of "ifconfig %s | perl -lne '/Mask:([\d.]+)/ and print $1'" % device to determine the interface of the network we are interested .. This may give us wrong information on the ip address of the network interface we are interested on.
diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py index b3f77ae..d5f7e50 100644 --- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py +++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py @@ -47,10 +47,10 @@ def find_host_name(): return execute("hostname")[0]
def find_netmask(device): - return execute("ifconfig $DEVICE | perl -lne '/Mask:([\d.]+)/ and print $1'")[0] + return execute("ifconfig %s | perl -lne '/Mask:([\d.]+)/ and print $1'" % device)[0]
def find_ip(device): - return execute("ifconfig $DEVICE | perl -lne '/inet addr:([\d.]+)/ and print $1'")[0] + return execute("ifconfig %s | perl -lne '/inet addr:([\d.]+)/ and print $1'" % device)[0]
def find_name_servers(): servers = execute("cat /etc/resolv.conf | perl -lne '/^nameserver\s+(\S+)$/ and print $1'")
commit 4e1aa66e133689bff5ad887d886f45b067069f76 Author: Pradeep Kilambi pkilambi@redhat.com Date: Thu Jul 16 15:20:07 2009 -0400
512236 - the org id checks were defaulting to None in custom channel cases instead of 1. Also the metadata sting frommaster is a string None so we need to check for the string. This should fix both custom and null org content in iss case. hosted syncs should work as usual.
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py index 6de2651..bf3cb63 100644 --- a/backend/satellite_tools/satsync.py +++ b/backend/satellite_tools/satsync.py @@ -874,7 +874,8 @@ Please contact your RHN representative""" % (generation, sat_cert.generation)) for t in nvrea_keys: nevra[t] = package[t] or ""
- if OPTIONS.orgid is not None: + if OPTIONS.orgid is not None and \ + package['org_id'] is not None: nevra['org_id'] = OPTIONS.orgid package['org_id'] = OPTIONS.orgid else: @@ -1442,7 +1443,8 @@ Please contact your RHN representative""" % (generation, sat_cert.generation)) for ks, timestamp in missing_kickstarts: ksobj = coll.get_item(ks, timestamp=timestamp) assert ksobj is not None - if OPTIONS.orgid is not None: + if OPTIONS.orgid is not None and \ + ksobj['org_id'] is not None: ksobj['org_id'] = OPTIONS.orgid batch.append(ksobj)
@@ -1690,8 +1692,6 @@ Please contact your RHN representative""" % (generation, sat_cert.generation)) uq_packages[pid] = package
uq_pkg_data = uq_packages.values() - # check to make sure the orgs exported are valid - _validate_package_org(uq_pkg_data) try: if OPTIONS.mount_point: importer = sync_handlers.link_channel_packages(uq_pkg_data, strict=0) @@ -1781,7 +1781,8 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
erratum['packages'] = packages
- if OPTIONS.orgid is not None: + if OPTIONS.orgid is not None and \ + erratum['org_id'] is not None: erratum['org_id'] = OPTIONS.orgid
# Now fix channels @@ -2023,13 +2024,15 @@ def _validate_package_org(batch): orgid = OPTIONS.orgid or None orgs = map(lambda a: a['id'], satCerts.get_all_orgs()) for pkg in batch: - if not OPTIONS.orgid and pkg['org_id'] is not None and \ - pkg['org_id'] not in orgs: - - pkg['org_id'] = 1 - else: + if not pkg['org_id'] or pkg['org_id'] == 'None': + # default to Null so do nothing + pkg['org_id'] = None + elif orgid: + # if options.orgid specified use it pkg['org_id'] = orgid - + elif pkg['org_id'] not in orgs: + # org from server is not valid + pkg['org_id'] = 1
def _getImportedChannels(): "Retrieves the channels already imported in the satellite's database"
commit 6ca26abc49d04ed905487732aa6734dca774d087 Author: Justin Sherrill jsherril@redhat.com Date: Thu Jul 16 14:19:20 2009 -0400
511963 - fixing issue where changing distro from non-para virt to paravirt would not update cobbler objects correctly (or vice-versa)
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java index aaeeff6..6d378c7 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerDistroCommand.java @@ -88,12 +88,31 @@ public class CobblerDistroCommand extends CobblerCommand { ksmeta.put("org", tree.getOrg().getId()); }
- if (xen != null) { - xen.setKernel(tree.getKernelXenPath()); - xen.setInitrd(tree.getInitrdXenPath()); - xen.setKsMeta(ksmeta); - xen.save(); + //if the newly edited tree does para virt.... + if (tree.doesParaVirt()) { + //IT does paravirt so we need to either update the xen distro or create one + if (xen == null) { + xen = Distro.create(con, tree.getCobblerXenDistroName(), + tree.getKernelXenPath(), tree.getInitrdXenPath(), ksmeta); + xen.save(); + tree.setCobblerXenId(xen.getId()); + } + else { + xen.setKernel(tree.getKernelXenPath()); + xen.setInitrd(tree.getInitrdXenPath()); + xen.setKsMeta(ksmeta); + xen.save(); + } + } + else { + //it doesn't do paravirt, so we need to delete the xen distro + if (xen != null) { + xen.remove(); + tree.setCobblerXenId(null); + } + } + if (nonXen != null) { nonXen.setInitrd(tree.getInitrdPath()); nonXen.setKernel(tree.getKernelPath()); diff --git a/java/code/src/org/cobbler/CobblerObject.java b/java/code/src/org/cobbler/CobblerObject.java index 588bafb..2e18e28 100644 --- a/java/code/src/org/cobbler/CobblerObject.java +++ b/java/code/src/org/cobbler/CobblerObject.java @@ -71,7 +71,9 @@ public abstract class CobblerObject { */ protected static Map<String, Object> lookupDataMapById(CobblerConnection client, String id, String findMethod) { - + if (id == null) { + return null; + } List<Map<String, Object>> objects = lookupDataMapsByCriteria(client, UID, id, findMethod); if (!objects.isEmpty()) {
commit 88fb9792edb765a9011a85f4a985ea6da3a69416 Author: Pradeep Kilambi pkilambi@redhat.com Date: Thu Jul 16 12:05:59 2009 -0400
adding disable_iss flag to rhn.conf
diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf index 1eed807..e1b3706 100644 --- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf @@ -20,6 +20,12 @@ iss_ca_chain = /usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT # allowed_iss_slaves=slave1-satellite.redhat.com,slave2-satellite.redhat.com allowed_iss_slaves=
+# Completely disable ISS. +# If set to 1, then no slave will be able to sync from this server +# this option does not affect ability to sync to this server from +# another spacewalk (or hosted). +disable_iss=0 + default_db = @@default_db@@
server.nls_lang = @@serverDOTnls_lang@@
commit fbae80186729b8edd725e68b872af6f87f096299 Author: Partha Aji paji@redhat.com Date: Wed Jul 15 18:54:25 2009 -0400
510785 - Initial stab on the Invalid KS Distro Base Path issue.
Added the concept of the a distro being 'invalid'. So if the cobbler id is null or the kernel or initrd of the distro points to an invalid location, the distro list page will show an error.
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java index 8dd7d43..6d1019e 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java @@ -570,14 +570,15 @@ public class KickstartFactory extends HibernateFactory { }
/** - * Fetch all trees for an org + * Fetch all trees for an org, these include + * trees where org_id is null or org_id = org.id * @param org owning org * @return list of KickstartableTrees */ - public static List <KickstartableTree> lookupKickstartTreesByOrg(Org org) { + public static List <KickstartableTree> lookupAccessibleTreesByOrg(Org org) { Session session = null; List retval = null; - String query = "KickstartableTree.findByOrg"; + String query = "KickstartableTree.findAccesibleToOrg"; session = HibernateFactory.getSession(); retval = session.getNamedQuery(query). setLong("org_id", org.getId().longValue()) @@ -585,6 +586,18 @@ public class KickstartFactory extends HibernateFactory { .setCacheable(true).list(); return retval; } + + /** + * Return a list of KickstartableTree objects in the Org + * @param org to lookup by + * @return List of KickstartableTree objects if found + */ + public static List<KickstartableTree> listTreesByOrg(Org org) { + Map<String, Object> params = new HashMap<String, Object>(); + params.put("org_id", org.getId()); + return singleton.listObjectsByNamedQuery( + "KickstartableTree.findByOrg", params, true); + }
/** * list all kickstart trees stored in the satellite @@ -594,11 +607,9 @@ public class KickstartFactory extends HibernateFactory { Session session = null; List retval = null; String query = "KickstartableTree.findAll"; - return singleton.listObjectsByNamedQuery(query, new HashMap()); + return singleton.listObjectsByNamedQuery(query, Collections.EMPTY_MAP, true); }
- - /** * Lookup KickstartableTree by tree id and org id * @param treeId desired tree @@ -868,19 +879,6 @@ public class KickstartFactory extends HibernateFactory { }
/** - * Lookup a list of KickstartData objects by the Org - * Useful for finding KickstartData objects that are in a org - * @param org to lookup by - * @return List of KickstartData objects if found - */ - public static List<KickstartData> listKickstartDataByOrg(Org org) { - Session session = getSession(); - Criteria c = session.createCriteria(KickstartData.class); - c.add(Restrictions.eq("org", org)); - return c.list(); - } - - /** * Lookup a list of all KickstartData objects located on the Satellite * Should not be used by much. Ignores org! * @return List of KickstartData objects if found @@ -900,7 +898,6 @@ public class KickstartFactory extends HibernateFactory { */ public static KickstartData lookupOrgDefault(Org org) { Session session = HibernateFactory.getSession(); - return (KickstartData) session .getNamedQuery("KickstartData.findOrgDefault") .setEntity("org", org) @@ -1025,6 +1022,4 @@ public class KickstartFactory extends HibernateFactory { Session session = HibernateFactory.getSession(); return (List<KickstartableTree>) session.getNamedQuery(query).list(); } - - } diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.hbm.xml b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.hbm.xml index 63f7b95..96b24e0 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.hbm.xml @@ -78,11 +78,14 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" order by k.label]]> </query>
- <query name="KickstartableTree.findByOrg"> + <query name="KickstartableTree.findAccessibleToOrg"> <![CDATA[from com.redhat.rhn.domain.kickstart.KickstartableTree as k where k.org = :org_id or k.org is null order by k.label]]> </query> - + <query name="KickstartableTree.findByOrg"> + <![CDATA[from com.redhat.rhn.domain.kickstart.KickstartableTree as k + where k.org.id = :org_id order by k.label]]> + </query> <query name="KickstartableTree.findAll"> <![CDATA[from com.redhat.rhn.domain.kickstart.KickstartableTree as k ]]> diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java index d5c66bb..168a25f 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java @@ -385,4 +385,18 @@ public class KickstartableTree extends BaseDomainHelper { } return Distro.lookupById(con, getCobblerId()); } + + private boolean pathExists(String path) { + return new File(path).exists(); + } + + /** + * Returns true if both the kernel path and initrd paths exist + * and cobbler id is not null for this distribution. + * @return true if this is a valid distro. + */ + public boolean isValid() { + return !StringUtils.isBlank(getCobblerId()) && + pathExists(getInitrdPath()) && pathExists(getKernelPath()); + } } diff --git a/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java b/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java index 9af8606..a6660f1 100644 --- a/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java +++ b/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java @@ -654,12 +654,12 @@ public class OrgImpl extends BaseDomainHelper implements Org { return false; } final OrgImpl other = (OrgImpl) obj; - if (id == null) { - if (other.id != null) { + if (getId() == null) { + if (other.getId() != null) { return false; } } - else if (!id.equals(other.id)) { + else if (!getId().equals(other.getId())) { return false; } return true; @@ -672,7 +672,7 @@ public class OrgImpl extends BaseDomainHelper implements Org { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); return result; } } 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 f194596..bdc1e53 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 @@ -14,22 +14,43 @@ */ package com.redhat.rhn.frontend.action.kickstart;
-import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.frontend.listview.PageControl; -import com.redhat.rhn.frontend.struts.BaseListAction; +import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.manager.kickstart.KickstartLister; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** * Handles listing of kickstart distributions * * @version $Rev $ */ -public class ViewTreesAction extends BaseListAction { - - protected DataResult getDataResult(RequestContext rctx, PageControl pc) { - return KickstartLister.getInstance().kickstartTreesInOrg( - rctx.getCurrentUser().getOrg(), pc); +public class ViewTreesAction extends RhnAction implements Listable { + /** + * ${@inheritDoc} + */ + public ActionForward execute(ActionMapping mapping, ActionForm form, + HttpServletRequest request, HttpServletResponse response) throws Exception { + ListHelper helper = new ListHelper(this, request); + helper.execute(); + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); + } + + /** + * {@inheritDoc} + */ + public List getResult(RequestContext contextIn) { + return KickstartFactory.listTreesByOrg(contextIn.getLoggedInUser().getOrg()); }
} 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 5ab91f4..ac272cd 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 @@ -16464,7 +16464,7 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Acti <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context> </context-group> </trans-unit> - + <!--KS schedule pages --> <group> <context-group name="ctx"> @@ -16775,34 +16775,31 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Acti <context context-type="sourcefile">/rhn/systems/details/kickstart/SessionCancel.do</context> </context-group> </trans-unit> - - <trans-unit id="kickstart.kickstartable_distributions.jsp"> - <source>Kickstartable Distributions</source> - <context-group name="ctx"> - <context context-type="sourcefile">/rhn/kickstart/ViewTrees.do</context> - </context-group> - </trans-unit> - - <trans-unit id="kickstart.kickstartable_distributions_text.jsp"> - <source>The following kickstart distributions are available.</source> - <context-group name="ctx"> - <context context-type="sourcefile">/rhn/kickstart/ViewTrees.do</context> - </context-group> - </trans-unit> - - <trans-unit id="kickstart.kickstartable_distro_create_new.jsp"> - <source>create new distribution</source> - <context-group name="ctx"> - <context context-type="sourcefile">/rhn/kickstart/ViewTrees.do</context> - </context-group> - </trans-unit> - - <trans-unit id="kickstart.distributions.jsp.nolists"> - <source>No kickstartable distributions available.</source> - <context-group name="ctx"> - <context context-type="sourcefile">/rhn/kickstart/ViewTrees.do</context> - </context-group> - </trans-unit> +<!-- KS Distributions List Page --> + <group> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/ViewTrees.do</context> + </context-group> + <trans-unit id="kickstart.distributions.jsp.nolists"> + <source>No kickstartable distributions available.</source> + </trans-unit> + <trans-unit id="kickstart.kickstartable_distro_create_new.jsp"> + <source>create new distribution</source> + </trans-unit> + <trans-unit id="kickstart.kickstartable_distributions.jsp"> + <source>Kickstartable Distributions</source> + </trans-unit> + <trans-unit id="kickstart.kickstartable_distributions_text.jsp"> + <source>The following kickstart distributions are available.</source> + </trans-unit> + <trans-unit id="kickstarts.distro.is-valid.tooltip"> + <source>Kickstart distributions may be invalid due wrong or non existent base path to the kernel or initrd image. To make your custom distribution valid please select the distribution and modify its base path appropriately.</source> + </trans-unit> + <trans-unit id="kickstart.distro.is-valid.jsp"> + <source>Valid?*</source> + </trans-unit> + </group> + <trans-unit id="preferences.jsp.lang.bn_IN"> <source>Bengali</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ColumnTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ColumnTag.java index 3587f3f..0a00a95 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/ColumnTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/ColumnTag.java @@ -65,6 +65,7 @@ public class ColumnTag extends BodyTagSupport { */ public void setSortattr(String sortAttr) { sortAttribute = sortAttr; + sortable = true; }
/** diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java index a686c59..6672255 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/test/KickstartTreeHandlerTest.java @@ -60,7 +60,7 @@ public class KickstartTreeHandlerTest extends BaseHandlerTestCase { public void testCreateKickstartableTree() throws Exception { String label = TestUtils.randomString(); List trees = KickstartFactory. - lookupKickstartTreesByOrg(admin.getOrg()); + lookupAccessibleTreesByOrg(admin.getOrg()); int origCount = 0; if (trees != null) { origCount = trees.size(); @@ -70,7 +70,7 @@ public class KickstartTreeHandlerTest extends BaseHandlerTestCase { "http://localhost/ks", baseChan.getLabel(), KickstartInstallType.RHEL_5); assertTrue(origCount + 1 == KickstartFactory. - lookupKickstartTreesByOrg(admin.getOrg()).size()); + lookupAccessibleTreesByOrg(admin.getOrg()).size()); }
public void testEditKickstartableTree() throws Exception { diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartWizardHelper.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartWizardHelper.java index a0b1dd5..e312d8a 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartWizardHelper.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartWizardHelper.java @@ -62,7 +62,7 @@ public class KickstartWizardHelper { * @return list of KickstartableTrees */ public List getKickstartableTrees() { - return KickstartFactory.lookupKickstartTreesByOrg(currentUser.getOrg()); + return KickstartFactory.lookupAccessibleTreesByOrg(currentUser.getOrg()); }
/** diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp index 3b7c025..63e7530 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> - +<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> html:xhtml/ <html> <body> @@ -21,20 +21,35 @@ <bean:message key="kickstart.kickstartable_distributions_text.jsp" /> </p> <div> - <form name="distribForm" method="POST" action="/rhn/kickstart/ViewTrees.do"> - <c:set var="pageList" value="${requestScope.pageList}" /> - <rhn:list pageList="${requestScope.pageList}" noDataText="kickstart.distributions.jsp.nolists"> - <rhn:listdisplay renderDisabled="true" set="${requestScope.set}" hiddenvars="${requestScope.newset}"> - <rhn:column header="kickstart.jsp.label"> - <a href="/rhn/kickstart/TreeEdit.do?kstid=${current.id}">${current.kickstartlabel}</a> - </rhn:column> - <rhn:column header="softwareedit.jsp.basechannel"> - ${current.channellabel} - </rhn:column> - </rhn:listdisplay> - </rhn:list> - </form> - </div> + <rl:listset name="ksDistros"> + <rl:list emptykey="kickstart.distributions.jsp.nolists" + alphabarcolumn="label"> + <rl:decorator name="PageSizeDecorator"/> + <rl:column + bound="false" + headerkey="kickstart.jsp.label" + sortattr="label" + defaultsort="asc" + filterattr="label" + styleclass="first-column"> + <a href="/rhn/kickstart/TreeEdit.do?kstid=${current.id}">${current.label}</a> + </rl:column> + <rl:column bound="false" headerkey="softwareedit.jsp.basechannel" sortattr="channel"> + ${current.channel.name} + </rl:column> + <rl:column headerkey="kickstart.distro.is-valid.jsp" sortattr="valid" styleclass="last-column"> + <c:choose> + <c:when test="${current.valid}"> + <img src="/img/rhn-listicon-checked.gif"> + </c:when> + <c:otherwise> + <img src="/img/rhn-listicon-error.gif"> + </c:otherwise> + </c:choose> + </rl:column> + </rl:list> + </rl:listset> </div> + <p>rhn:tooltip*-<bean:message key="kickstarts.distro.is-valid.tooltip"/></rhn:tooltip></p> </body> </html>
commit cf1fe73d24335a4924d38ab748978bf6c5a6ae35 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jul 15 18:05:50 2009 +0200
Automatic commit of package [spacewalk-utils] release [0.6.5-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils index cce442a..215f738 100644 --- a/rel-eng/packages/spacewalk-utils +++ b/rel-eng/packages/spacewalk-utils @@ -1 +1 @@ -0.6.4-1 utils/ +0.6.5-1 utils/ diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec index 552f0cf..6c946db 100644 --- a/utils/spacewalk-utils.spec +++ b/utils/spacewalk-utils.spec @@ -1,7 +1,7 @@ %define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils -Version: 0.6.4 +Version: 0.6.5 Release: 1%{?dist} Summary: Utilities that may be run against a Spacewalk server.
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog +* Wed Jul 15 2009 Miroslav Suchý msuchy@redhat.com 0.6.5-1 +- add spacewalk-api script, which can interact with API from command line + * Mon May 11 2009 Brad Buckingham bbuckingham@redhat.com 0.6.4-1 - 500173 - update migrate-system-profile to import scripts from utils vs spacewalk_tools (bbuckingham@redhat.com)
commit fe7fd7a22df8d7055b25aae5f82c742c88b5f1d6 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jul 15 18:02:17 2009 +0200
add spacewalk-api script, which can interact with API from command line
diff --git a/utils/Makefile b/utils/Makefile index b8cb8bf..fa6ceb0 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -7,12 +7,12 @@ NAME := spacewalk-utils SUBDIR = utils
FILES = __init__ systemSnapshot migrateSystemProfile -SCRIPTS = sw-system-snapshot migrate-system-profile +SCRIPTS = sw-system-snapshot migrate-system-profile spacewalk-api
DOCBOOK = $(wildcard /usr/bin/docbook2man)
SGMLS = $(wildcard *.sgml) -MANS = $(patsubst %.sgml,%.8,$(SGMLS)) +MANS = $(patsubst %.sgml,%.8,$(SGMLS) )
BINDIR = /usr/bin MANDIR ?= /usr/man @@ -29,8 +29,9 @@ install :: $(SCRIPTS) $(PREFIX)/$(BINDIR) ifneq ($(DOCBOOK),) # install man pages all :: $(MANS) + pod2man --section=8 spacewalk-api spacewalk-api.8 install :: $(MANS) $(PREFIX)/$(MANDIR) - $(INSTALL_DATA) $(MANS) $(PREFIX)/$(MANDIR)/man8 + $(INSTALL_DATA) $(MANS) spacewalk-api.8* $(PREFIX)/$(MANDIR)/man8 endif
%.new : % diff --git a/utils/spacewalk-api b/utils/spacewalk-api new file mode 100644 index 0000000..6abb41c --- /dev/null +++ b/utils/spacewalk-api @@ -0,0 +1,142 @@ +#!/usr/bin/perl +use strict; +# +# Copyright (c) 2009 Red Hat, Inc. +# +# This software is licensed to you under the GNU General Public License, +# version 2 (GPLv2). There is NO WARRANTY for this software, express or +# implied, including the implied warranties of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +# along with this software; if not, see +# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +# +# Red Hat trademarks are not licensed under GPLv2. No permission is +# granted to use or replicate Red Hat trademarks that are incorporated +# in this software or its documentation. +# + +use Data::Dumper; +use Getopt::Long; +use Frontier::Client; +use Term::ReadKey; + +#set defaults; +my ($server, $user, $password)= ('', '', ''); +my $login=1; + +GetOptions("server=s" => $server, + "login!" => $login, + "user:s" => $user, + "password:s" => $password, + ); + +if (not $server) { + print "Error: No server specified.\n"; + exit 1; +} + +# read username if not given on command line +if ((not $user) and $login) { + print "Enter username: "; + $user = ReadLine 0; + chomp $user; + print "\n"; +} + +# read password if not given on command line +if ((not $password) and $login) { + print "Enter your password: "; + ReadMode 'noecho'; + $password = ReadLine 0; + chomp $password; + ReadMode 'normal'; + print "\n"; +} + +my $client = new Frontier::Client(url => "http://$server/rpc/api"); + +my $session; +if ($login) { + $session = $client->call('auth.login', $user, $password); + if (not $session) { + print "Error: Log in failed.\n"; + exit 2; + } +} + +my @params; +while (my $param = shift @ARGV) { + if ($param eq '%session%') { + $param = $session; + } elsif ( $param =~ '%file:(.*)%') { + open F, $1 or die "Error: Could not open $1"; + $param = join('', <F>); + close F; + } + push @params, $param; +} + +my $data = $client->call(@params); + +print Data::Dumper->Dump([$data], ["result"]); + +if ($login) { + $client->call('auth.logout', $session); +} + +=pod + +=head1 NAME + +spacewalk-api - Call Spacawalk API from command line. + +=head1 SYNOPSIS + +spacewalk-api [OPTIONS] --server=spacewalk.domain.com FUNCTION [PARAM1 PARAM2 ...] + +=head1 DESCRIPTION + +spacewalk-api interact with the Spacewalk server and expose its API layer. + +FUNCTION is api method you wish to call and is followed by its parameters. +There is few special substitution available: + +%session% + Is replaced with sessionid. If you use --nologin option, then it is replaced by empty string. + +%file:/some/file% + Is replaced by content of given file. + +=head1 OPTIONS + +--server + URL of your Spacewalk server. + +--login +--nologin + If we should log in or not. Default is to log in. + +--user + Name of user to log in. + +--password + If you do not specify this and unless --nologin is specified, you will be prompted for your password. + +=head1 EXAMPLES + + spacewalk-api --server=spacewalk.com --nologin api.systemVersion + + spacewalk-api --server=spacewalk.com --user=foo --password=bar channel.listAllChannels "%session%" + + spacewalk-api --server=spacewalk.com --nologin proxy.isProxy '%file:/etc/sysconfig/rhn/systemid%' + +=head1 AUTHOR + +Miroslav Suchý msuchy@redhat.com + +=head1 COPYRIGHT AND LICENSE + +Copyright (c) 2009 Red Hat, Inc. +Released under GNU General Public License, version 2 (GPLv2). + +=cut diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec index a4a79bd..552f0cf 100644 --- a/utils/spacewalk-utils.spec +++ b/utils/spacewalk-utils.spec @@ -16,6 +16,7 @@ BuildRequires: /usr/bin/docbook2man BuildRequires: docbook-utils
Requires: python, rpm-python +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description Generic utilities that may be run against a Spacewalk server. This package @@ -44,14 +45,12 @@ rm -rf $RPM_BUILD_ROOT
%files %defattr(-,root,root) -%attr(755,root,root) %{_bindir}/sw-system-snapshot -%attr(755,root,root) %{_bindir}/migrate-system-profile +%attr(755,root,root) %{_bindir}/* %dir %{rhnroot}/utils %{rhnroot}/utils/__init__.py* %{rhnroot}/utils/systemSnapshot.py* %{rhnroot}/utils/migrateSystemProfile.py* -%{_mandir}/man8/sw-system-snapshot.8* -%{_mandir}/man8/migrate-system-profile.8* +%{_mandir}/man8/*
%changelog
commit 7e029cca2dd724b92cf8da00789a52875dc0fe20 Author: Milan Zazrivec mzazrivec@redhat.com Date: Wed Jul 15 08:29:49 2009 +0200
511377 - insert 'i86pc' row only if it doesn't exist
This row may already be present in the schema from a previous satellite-sync.
diff --git a/schema/spacewalk/upgrade/spacewalk-0.2-spacewalk-0.3/100-rhnCpuArch-i86pc.sql b/schema/spacewalk/upgrade/spacewalk-0.2-spacewalk-0.3/100-rhnCpuArch-i86pc.sql index 509fc4b..8ab903b 100644 --- a/schema/spacewalk/upgrade/spacewalk-0.2-spacewalk-0.3/100-rhnCpuArch-i86pc.sql +++ b/schema/spacewalk/upgrade/spacewalk-0.2-spacewalk-0.3/100-rhnCpuArch-i86pc.sql @@ -1,4 +1,9 @@ - -insert into rhnCpuArch (id, label, name) values -(rhn_cpu_arch_id_seq.nextval, 'i86pc', 'i86pc'); +insert into rhnCpuArch (id, label, name) ( + select rhn_cpu_arch_id_seq.nextval, 'i86pc', 'i86pc' + from dual + where not exists ( + select 1 + from rhnCpuArch + where label = 'i86pc' and name = 'i86pc') +);
commit 3b88d929f09a44f11df89409d2920b55c4312022 Author: Brad Buckingham bbuckingham@redhat.com Date: Tue Jul 14 19:10:45 2009 -0400
rhn-load-config.pl - remove accidental 's'
diff --git a/spacewalk/setup/share/upgrade/rhn-load-config.pl b/spacewalk/setup/share/upgrade/rhn-load-config.pl index 5ea4fb6..93df00e 100755 --- a/spacewalk/setup/share/upgrade/rhn-load-config.pl +++ b/spacewalk/setup/share/upgrade/rhn-load-config.pl @@ -122,7 +122,7 @@ RHN::SatInstall->write_config(%config_opts,
Spacewalk::Setup::satcon_deploy(); -s + print "Done\n";
exit 0;
commit 9a04a11541e09092ee74322ab9b2a480ba6c8056 Author: Partha Aji paji@redhat.com Date: Tue Jul 14 17:54:12 2009 -0400
511100 - Fixed upgrade scripts to include cobbler.host
diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf index b7a2e16..1eed807 100644 --- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf @@ -88,3 +88,6 @@ web.force_unentitlement=0
# system snapshots enabled enable_snapshots = 1 + +#cobbler host name +cobbler.host = @@cobblerDOThost@@ diff --git a/spacewalk/config/satellite-rules.conf b/spacewalk/config/satellite-rules.conf index e68ccc7..dea21ff 100644 --- a/spacewalk/config/satellite-rules.conf +++ b/spacewalk/config/satellite-rules.conf @@ -101,4 +101,6 @@ webDOTis_monitoring_scout= # line 45 serverDOTnls_lang[prompt]=Enter a value for serverDOTnls_lang serverDOTnls_lang=english.UTF8 - +#line 46 +cobblerDOThost[prompt]=Enter a value for cobblerDOThost +cobblerDOThost= diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 7285b45..7a00825 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -983,6 +983,7 @@ sub populate_initial_configs { monitoringDOTorahome => '/opt/oracle', monitoringDOTdbd => 'Oracle', monitoringDOTscout_shared_key => '', # blank for now. + cobblerDOThost => $answers->{hostname} );
for ($config_opts{'db_password'}) { diff --git a/spacewalk/setup/share/upgrade/rhn-load-config.pl b/spacewalk/setup/share/upgrade/rhn-load-config.pl old mode 100644 new mode 100755 index 2d2535f..5ea4fb6 --- a/spacewalk/setup/share/upgrade/rhn-load-config.pl +++ b/spacewalk/setup/share/upgrade/rhn-load-config.pl @@ -115,16 +115,14 @@ if ($already_monitoring) {
my %nls_database_paramaters = RHN::SatInstall->get_nls_database_parameters(); $config_opts{serverDOTnls_lang} = 'english.' . $nls_database_paramaters{NLS_CHARACTERSET}; - +$config_opts{cobblerDOThost} = Sys::Hostname::hostname; print "Writing configuration\n"; - - RHN::SatInstall->write_config(%config_opts, '/etc/sysconfig/rhn-satellite-prep/satellite-local-rules.conf');
Spacewalk::Setup::satcon_deploy(); - +s print "Done\n";
exit 0;
commit 22d042ad3421c0f068981a9353fb606127133049 Author: Milan Zazrivec mzazrivec@redhat.com Date: Tue Jul 14 21:57:21 2009 +0200
511052 - script to fix rhn_sat_node, rhn_sat_cluster
This script sets rhn_sat_node.ip and rhn_sat_cluster.vip for satellite monitoring scout to IP address of your satellite if set to 127.0.0.1 by previous installation. This script is to be used during satellite upgrade.
diff --git a/spacewalk/setup/share/upgrade/rhn-update-monitoring.pl b/spacewalk/setup/share/upgrade/rhn-update-monitoring.pl new file mode 100755 index 0000000..2679760 --- /dev/null +++ b/spacewalk/setup/share/upgrade/rhn-update-monitoring.pl @@ -0,0 +1,65 @@ +#!/usr/bin/perl + +# This script fixes monitoring problem described in bug #511052 +# Earlier Satellites (3.7) set rhn_sat_node.ip and rhn_sat_cluster.vip +# to '127.0.0.1' during installation / monitoring activation. These +# values need to be set to ip address of satellite for MonitoringAccessHandler.pm +# to operate properly. + +use strict; +use warnings; + +use Sys::Hostname; +use RHN::SatInstall; +use RHN::Utils; +use RHN::DataSource::Simple; + +my $org_id = RHN::SatInstall->get_satellite_org_id(); +my $db_connect = RHN::SatInstall->test_db_connection(); +die "Could not connect to the database" unless $db_connect; + +my $ds = new RHN::DataSource::Simple(-querybase => "scout_queries", + -mode => 'scouts_for_org'); +my $data = $ds->execute_query(-org_id => $org_id); +my ($scout) = grep { not $_->{SERVER_ID} } @{$data}; + +exit 0 unless $scout; + +my ($ip, $vip) = ($scout->{IP}, $scout->{VIP}); +my ($sn_id, $sc_id) = ($scout->{SAT_NODE_ID}, $scout->{ID}); + +if ($ip eq '127.0.0.1' or $vip eq '127.0.0.1') { + my $hostname = Sys::Hostname::hostname; + my $ip_addr = RHN::Utils::find_ip_address($hostname); + + my $dbh = RHN::DB->connect; + + my $sql1 = q{ + update rhn_sat_node + set ip = :ip, + last_update_user = 'upgrade', + last_update_date = sysdate + where ip = '127.0.0.1' and + recid = :recid + }; + my $sql2 = q{ + update rhn_sat_cluster + set vip = :vip, + last_update_user = 'upgrade', + last_update_date = sysdate + where vip = '127.0.0.1' and + recid = :recid + }; + + $dbh->do_h($sql1, + ip => $ip_addr, + recid => $sn_id, + ); + $dbh->do_h($sql2, + vip => $ip_addr, + recid => $sc_id, + ); + $dbh->commit; +} + +1;
commit b40b1b03df90eb8773c971b3e6fd8e929483a2e7 Author: Pradeep Kilambi pkilambi@redhat.com Date: Tue Jul 14 12:28:34 2009 -0400
Adding back custom check removed for debugging
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/java/code/src/com/redhat/rhn/domain/channel/Channel.java index adc17c9..ca5071e 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java +++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java @@ -810,8 +810,8 @@ public class Channel extends BaseDomainHelper implements Comparable { DistChannelMap channelDist = ChannelFactory.lookupDistChannelMap(toConsider); if (channelDist != null) { String release = channelDist.getRelease(); - // If channle or parent is RHEL-5 use sha1, else use sha256 - if (sha1compatiblechannels.contains(release)) { + // If channel or parent is RHEL-5 use sha1, else use sha256 + if (toConsider.isCustom() || sha1compatiblechannels.contains(release)) { return CHECKSUM_SHA_1; } else {
commit 3cc55fde0273207c056868ac497f063963555b7f Author: Devan Goodwin dgoodwin@redhat.com Date: Tue Jul 14 10:52:49 2009 -0300
Return config channels sorted highest to lowest priority.
Suggested by Maxim Burgerhout maxim@wzzrd.com on the spacewalk-devel list, rhncfg-client was returning the list of config channels sorted in the opposite order the web UI was. Changed now so that they both return highest priority first.
diff --git a/backend/server/handlers/config/rhn_config_management.py b/backend/server/handlers/config/rhn_config_management.py index f2f3fe9..4b16fa9 100644 --- a/backend/server/handlers/config/rhn_config_management.py +++ b/backend/server/handlers/config/rhn_config_management.py @@ -212,7 +212,7 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler): and scc.config_channel_id = cc.id and cc.confchan_type_id = cct.id and cct.label in ('normal', 'local_override') - order by scc.position desc nulls last, cc.name desc + order by scc.position nulls last, cc.name desc """)
def _get_client_config_channels(self, server_id):
commit 3f09640a40cab644e93253ea1c977544ed98e3bc Author: Pradeep Kilambi pkilambi@redhat.com Date: Mon Jul 13 19:35:32 2009 -0400
508331 - sha256 checksum support for yum repo generation stuff through taskomatic. We were hardcoding the checksum as sha1 by default. Now we determine the checksum type based on the release. If the channel or in child channel case(its parent) is el5 we use sha1. Otherwise, we default to sha256.
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/java/code/src/com/redhat/rhn/domain/channel/Channel.java index b45d739..adc17c9 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java +++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java @@ -50,6 +50,8 @@ public class Channel extends BaseDomainHelper implements Comparable { public static final String PUBLIC = "public"; public static final String PROTECTED = "protected"; public static final String PRIVATE = "private"; + private static final String CHECKSUM_SHA_1 = "SHA1"; + private static final String CHECKSUM_SHA_256 = "SHA-256";
private static List<String> releaseToSkipRepodata = new ArrayList<String>(Arrays .asList("2.1AS", "2.1ES", "2.1WS", "3AS", "3ES", "3WS", "3Desktop", "4AS", @@ -57,6 +59,8 @@ public class Channel extends BaseDomainHelper implements Comparable { private static List<String> archesToSkipRepodata = new ArrayList<String>(Arrays .asList("channel-sparc-sun-solaris", "channel-i386-sun-solaris", "channel-sparc")); + private static List<String> sha1compatiblechannels = new ArrayList<String>(Arrays + .asList("5Server", "5Client")); private String baseDir; private ChannelArch channelArch; private String description; @@ -791,4 +795,30 @@ public class Channel extends BaseDomainHelper implements Comparable { public boolean containsDistributions() { return ChannelFactory.containsDistributions(this); } + + /** + * get the compatible checksum type to be used for repomd.xml + * based on channel release. If its RHEL-5 we use sha1 + * anything newer will be sha256. + * @return checksumType + */ + public String getChecksumType() { + Channel toConsider = this; + while (toConsider.getParentChannel() != null) { + toConsider = toConsider.getParentChannel(); + } + DistChannelMap channelDist = ChannelFactory.lookupDistChannelMap(toConsider); + if (channelDist != null) { + String release = channelDist.getRelease(); + // If channle or parent is RHEL-5 use sha1, else use sha256 + if (sha1compatiblechannels.contains(release)) { + return CHECKSUM_SHA_1; + } + else { + return CHECKSUM_SHA_256; + } + } + // default to sha256 + return CHECKSUM_SHA_256; + } } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java index 6750f47..1ee0db6 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java @@ -40,14 +40,15 @@ public class CompressingDigestOutputWriter extends OutputStream implements /** * * @param stream The stream to compress + * @param checksumtype checksum type */ - public CompressingDigestOutputWriter(OutputStream stream) { + public CompressingDigestOutputWriter(OutputStream stream, String checksumtype) { try { compressedDigestStream = new DigestOutputStream(stream, - MessageDigest.getInstance("SHA1")); + MessageDigest.getInstance(checksumtype)); compressedStream = new GZIPOutputStream(compressedDigestStream); uncompressedDigestStream = new DigestOutputStream(compressedStream, - MessageDigest.getInstance("SHA1")); + MessageDigest.getInstance(checksumtype)); } catch (NoSuchAlgorithmException nsae) { // XXX fatal runtime exception diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdIndexData.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdIndexData.java index 36f53e2..a29ff41 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdIndexData.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdIndexData.java @@ -26,6 +26,7 @@ public class RepomdIndexData { private String checksum; private String openChecksum; private Date timestamp; + private String type;
/** * @@ -41,6 +42,27 @@ public class RepomdIndexData {
/** * + * @return checksum type + */ + public String getType() { + return type; + } + + /** + * This is specifically for type value in repomd.xml + * @param typeIn checksum type + */ + public void setType(String typeIn) { + if (typeIn == "SHA1") { + this.type = "sha"; + } + else if (typeIn == "SHA-256") { + this.type = "sha256"; + } + } + + /** + * * @return checksum info */ public String getChecksum() { diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdIndexWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdIndexWriter.java index 186ce95..41722f0 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdIndexWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdIndexWriter.java @@ -119,7 +119,7 @@ public class RepomdIndexWriter { handler.endElement("location");
attr.clear(); - attr.addAttribute("type", "sha"); + attr.addAttribute("type", data.getType()); handler.startElement("checksum", attr); handler.addCharacters(data.getChecksum()); handler.endElement("checksum"); @@ -127,7 +127,7 @@ public class RepomdIndexWriter { // this can be null for group info, since it is uncompressed if (data.getOpenChecksum() != null) { attr.clear(); - attr.addAttribute("type", "sha"); + attr.addAttribute("type", data.getType()); handler.startElement("open-checksum", attr); handler.addCharacters(data.getOpenChecksum()); handler.endElement("open-checksum"); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java index 2b88668..ab91812 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java @@ -55,6 +55,7 @@ public class RepositoryWriter { private Logger log = Logger.getLogger(RepositoryWriter.class); private String pathPrefix; private String mountPoint; + private String checksumtype;
/** * Constructor takes in pathprefix and mountpoint @@ -102,13 +103,16 @@ public class RepositoryWriter { CompressingDigestOutputWriter filelistsFile; CompressingDigestOutputWriter otherFile;
+ // Get compatible checksumType + this.checksumtype = channel.getChecksumType(); + try { primaryFile = new CompressingDigestOutputWriter( - new FileOutputStream(prefix + PRIMARY_FILE)); + new FileOutputStream(prefix + PRIMARY_FILE), this.checksumtype); filelistsFile = new CompressingDigestOutputWriter( - new FileOutputStream(prefix + FILELISTS_FILE)); + new FileOutputStream(prefix + FILELISTS_FILE), this.checksumtype); otherFile = new CompressingDigestOutputWriter(new FileOutputStream( - prefix + OTHER_FILE)); + prefix + OTHER_FILE), this.checksumtype); } catch (IOException e) { throw new RepomdRuntimeException(e); @@ -173,10 +177,18 @@ public class RepositoryWriter {
log.info("Starting updateinfo generation for '" + channel.getLabel() + '"'); - RepomdIndexData updateinfoData = generateUpdateinfo(channel, prefix); + RepomdIndexData updateinfoData = generateUpdateinfo(channel, prefix, + this.checksumtype);
RepomdIndexData groupsData = loadCompsFile(channel);
+ //Set the type so yum can read and perform checksum + primaryData.setType(this.checksumtype); + filelistsData.setType(this.checksumtype); + otherData.setType(this.checksumtype); + updateinfoData.setType(this.checksumtype); + groupsData.setType(this.checksumtype); + FileWriter indexFile;
try { @@ -238,7 +250,7 @@ public class RepositoryWriter { DigestInputStream digestStream; try { digestStream = new DigestInputStream(stream, MessageDigest - .getInstance("SHA1")); + .getInstance(this.checksumtype)); } catch (NoSuchAlgorithmException nsae) { throw new RepomdRuntimeException(nsae); @@ -316,9 +328,11 @@ public class RepositoryWriter { * Generates update info for given channel * @param channel channel info * @param prefix repodata file prefix + * @param checksumtype checksum type * @return repodata index */ - private RepomdIndexData generateUpdateinfo(Channel channel, String prefix) { + private RepomdIndexData generateUpdateinfo(Channel channel, String prefix, + String checksumtypeIn) {
if (channel.getErratas().size() == 0) { return null; @@ -327,7 +341,7 @@ public class RepositoryWriter { CompressingDigestOutputWriter updateinfoFile; try { updateinfoFile = new CompressingDigestOutputWriter( - new FileOutputStream(prefix + UPDATEINFO_FILE)); + new FileOutputStream(prefix + UPDATEINFO_FILE), checksumtypeIn); } catch (FileNotFoundException e) { throw new RepomdRuntimeException(e);
commit 65c5bd8406e253fdf5f25e9ba44d45bff100c1d8 Author: Justin Sherrill jsherril@redhat.com Date: Mon Jul 13 18:02:11 2009 -0400
511116 - changing updatePackages to change the permissions on the kickstart trees in the same way we do for packages within /var/satellite
diff --git a/backend/satellite_tools/updatePackages.py b/backend/satellite_tools/updatePackages.py index beb9700..daa5d37 100644 --- a/backend/satellite_tools/updatePackages.py +++ b/backend/satellite_tools/updatePackages.py @@ -75,6 +75,7 @@ def main(): process_package_data()
rhnSQL.commit() + process_kickstart_trees() sys.stderr.write("Transaction Committed! \n")
def get_new_pkg_path(nvrea, org_id, prepend="", omit_epoch=None, @@ -188,6 +189,11 @@ def process_package_data(): if verbose: print " Skipping %s packages, paths not found" % len(skip_list) return
+def process_kickstart_trees(): + for root,dirs,files in os.walk(CFG.MOUNT_POINT + "/rhn/"): + for name in files: + os.chmod(root + '/' + name, 0644) +
if __name__ == '__main__': main()
commit 52f29b24213b699be3eb742ef37c3797b3048eef Author: Devan Goodwin dgoodwin@redhat.com Date: Mon Jul 13 17:54:26 2009 -0300
510329 - Fix SSM package operations UI timeout.
SSM package install/upgrade/verify/remove operations were recently ported from Perl to Java. During this time the database conversation changed dramatically and relied much more heavily on Hibernate objects. When there were approx 10k systems in the SSM the operation would run for a couple minutes and then timeout.
To fix this we first changed these operations to take place asynchronously in the background, the UI now returns much more quickly (though we still see this at around 30 seconds for large data sets), allowing the task to run as long as necessary in the background.
Sadly this turned out to run for over 90 minutes, still not sure how long it would have taken to complete. To remedy we began batching the server object lookup in Hibernate into groups of 1000 instead of 1 by 1, and the actions to schedule one parent action instead of one per server.
End result for the 10k data set on our hardware was a runtime of about 2 minutes for the background task.
Squashed commit of the following:
commit 1318b61831167df19a9349a1f66413eecd9ddc83 Author: Jason Dobies jason.dobies@redhat.com Date: Mon Jul 13 16:16:39 2009 -0400
510329 - Performance enhancements for SSM package upgrade.
After looking at the old perl version, it turns out we never checked which packages can be upgraded on a per sever basis. The functionality was that we'd just flat out schedule upgrades (which really are just installs) for each server selected in the SSM, regardless of whether or not the package was already installed.
This commit changes the Java implementation to use this behavior, drastically increasing the performance in the process.
commit f4a560cb7fb3d8c0cb0c3eacb52f2d0f603dfeb6 Author: Devan Goodwin dgoodwin@redhat.com Date: Mon Jul 13 16:55:56 2009 -0300
Pass user ID instead of user into SSM package install action.
commit 32433cbe894fa2b7acd6319c8275dac6715c0b5d Author: Devan Goodwin dgoodwin@redhat.com Date: Mon Jul 13 16:46:44 2009 -0300
Switch SSM verify operation to pass user ID instead of object.
These asynchronous scheduled tasks execute in a separate thread inside Tomcat, Hiberante collection association errors can occur in some scenarios. Seems sharing Hibernate objects across this boundary is a no-no in general.
commit 06dd5b7b8076a17ac52b8c2f6943a8cfb00ff091 Author: Devan Goodwin dgoodwin@redhat.com Date: Mon Jul 13 14:38:12 2009 -0300
Add some debug logging to the SsmInstallPackagesAction.
commit 9a9a6b2cd43cf9a9491d93126c96780dfcebed4c Author: Jason Dobies jason.dobies@redhat.com Date: Mon Jul 13 09:25:35 2009 -0400
510329 - Chunked processing of SSM package upgrades. Performance isn't much better just yet, but checking it in for sharing purposes.
commit 96e4ff3e839a922ed2067489987e4a4940a200bd Author: Devan Goodwin dgoodwin@redhat.com Date: Fri Jul 10 16:59:01 2009 -0300
Make SSM verify package confirmation message match the others.
commit c3a10aaf0ee03b356101054bf705a43672100b39 Author: Devan Goodwin dgoodwin@redhat.com Date: Fri Jul 10 16:50:41 2009 -0300
Redirect to SSM async status screen for remove/upgrade.
commit 672d378b75666e2308fc589c215bace2b6d67e3a Author: Devan Goodwin dgoodwin@redhat.com Date: Fri Jul 10 15:55:53 2009 -0300
Make SSM package installation confirmation message match remove/upgrade.
commit 2f557ea3bfd9bf5e8ea6a84fe5983f100d9f515c Author: Devan Goodwin dgoodwin@redhat.com Date: Fri Jul 10 14:49:32 2009 -0300
Use asynchronous task for SSM upgrade packages.
Still very slow, speed improvements coming.
commit 1b460499cd5d7e458b4ae26a2d52917cf5842fcc Author: Jason Dobies jason.dobies@redhat.com Date: Fri Jul 10 11:43:55 2009 -0400
I18n-izied
commit e1c6ad145441ee7b16ca8ce34f99b4e885e498ff Author: Jason Dobies jason.dobies@redhat.com Date: Fri Jul 10 11:40:18 2009 -0400
510329 - Changed SSM package verify to use the SSM async model
commit 67db189d4416379eb2b7e8d6dd37f88767e51021 Author: Jason Dobies jason.dobies@redhat.com Date: Fri Jul 10 10:14:26 2009 -0400
Renamed for consistency
commit 78f13da59459bcdf8126ae4602ab3c16b83dd1da Author: Devan Goodwin dgoodwin@redhat.com Date: Fri Jul 10 10:58:47 2009 -0300
Major performance increase for SSM package removal.
With 10k systems this was taking beyond 40 minutes, mostly due to the use of the per server lookup method, which also does a check for access after the initial hibernate object lookup. Switched to use batching and stop doing the unecessary access check, now runs in less than 2 minutes. Given this is now done asynchronously and not blocking the web UI, this should be ok.
commit 82e271d068470b1b1db01e4ab62163c6a5fdabd5 Author: Devan Goodwin dgoodwin@redhat.com Date: Fri Jul 10 09:54:53 2009 -0300
510329 - Modify SSM package removal to use message queue.
commit 9283d1bff7a37d9224cdaba2feab5559de7cd513 Author: Jason Dobies jason.dobies@redhat.com Date: Thu Jul 9 20:21:02 2009 -0400
We should at least log an error in the scheduling so the request doesn't seem to just disappear.
commit e7771fff9dbf173101d72cea9e133cc10363769e Author: Jason Dobies jason.dobies@redhat.com Date: Thu Jul 9 17:22:51 2009 -0400
510329 - More optimization; moved the system loading into the async action as well
commit 0b6bf7172a7c7e6e6a246d78605d723682b50f95 Author: Jason Dobies jason.dobies@redhat.com Date: Thu Jul 9 16:00:53 2009 -0400
510329 - Migrated SSM package installation to use the message queue to help alleviate time outs when using a large number of systems
commit df9f0186552222e07c4f55295158e785cf6a6769 Author: Devan Goodwin dgoodwin@redhat.com Date: Thu Jul 9 15:05:17 2009 -0300
Add clarification comment in SSM package removal action.
commit 8e0f36672ec8b192806e846d7c9a99c59df598da Author: Devan Goodwin dgoodwin@redhat.com Date: Thu Jul 9 14:37:55 2009 -0300
510329 - Improve SSM package installation performance.
Still not there yet, request still timing out but chunking server IDs into lists of 1000 instead of looking each up individually was a significant improvement.
Conflicts:
java/code/src/com/redhat/rhn/domain/server/ServerFactory.java
diff --git a/java/code/src/com/redhat/rhn/common/messaging/MessageQueue.java b/java/code/src/com/redhat/rhn/common/messaging/MessageQueue.java index fd0c845..3be8af1 100644 --- a/java/code/src/com/redhat/rhn/common/messaging/MessageQueue.java +++ b/java/code/src/com/redhat/rhn/common/messaging/MessageQueue.java @@ -15,6 +15,11 @@
package com.redhat.rhn.common.messaging;
+import com.redhat.rhn.frontend.events.SsmRemovePackagesAction; +import com.redhat.rhn.frontend.events.SsmRemovePackagesEvent; +import com.redhat.rhn.frontend.events.SsmUpgradePackagesAction; +import com.redhat.rhn.frontend.events.SsmUpgradePackagesEvent; + import EDU.oswego.cs.dl.util.concurrent.Channel; import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
@@ -30,6 +35,10 @@ import com.redhat.rhn.frontend.events.TraceBackAction; import com.redhat.rhn.frontend.events.TraceBackEvent; import com.redhat.rhn.frontend.events.UpdateErrataCacheAction; import com.redhat.rhn.frontend.events.UpdateErrataCacheEvent; +import com.redhat.rhn.frontend.events.SsmInstallPackagesAction; +import com.redhat.rhn.frontend.events.SsmInstallPackagesEvent; +import com.redhat.rhn.frontend.events.SsmVerifyPackagesAction; +import com.redhat.rhn.frontend.events.SsmVerifyPackagesEvent;
import org.apache.log4j.Logger;
@@ -42,7 +51,6 @@ import java.util.Map; /** * A class that passes messages from the sender to an action class * - * @version $Rev$ */ public class MessageQueue {
@@ -251,11 +259,24 @@ public class MessageQueue { RestartSatelliteAction ra = new RestartSatelliteAction(); MessageQueue.registerAction(ra, RestartSatelliteEvent.class);
- // Used to allow SSM operations to be run asynchronously + // Used to allow SSM child channel changes to be run asynchronously SsmChangeChannelSubscriptionsAction sccsa = new SsmChangeChannelSubscriptionsAction(); MessageQueue.registerAction(sccsa, SsmChangeChannelSubscriptionsEvent.class); - + + // Used to allow SSM package installs to be run asynchronously + SsmInstallPackagesAction ssmPackageInstallAction = new SsmInstallPackagesAction(); + MessageQueue.registerAction(ssmPackageInstallAction, SsmInstallPackagesEvent.class); + + SsmRemovePackagesAction ssmRpa = new SsmRemovePackagesAction(); + MessageQueue.registerAction(ssmRpa, SsmRemovePackagesEvent.class); + + SsmVerifyPackagesAction ssmVpa = new SsmVerifyPackagesAction(); + MessageQueue.registerAction(ssmVpa, SsmVerifyPackagesEvent.class); + + SsmUpgradePackagesAction ssmUpa = new SsmUpgradePackagesAction(); + MessageQueue.registerAction(ssmUpa, SsmUpgradePackagesEvent.class); + //Clone Errata into a channel CloneErrataAction cea = new CloneErrataAction(); MessageQueue.registerAction(cea, CloneErrataEvent.class); diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java index d265624..18c8a7d 100644 --- a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java +++ b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java @@ -29,8 +29,11 @@ import com.redhat.rhn.frontend.xmlrpc.ChannelSubscriptionException; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.system.UpdateBaseChannelCommand;
+import java.util.LinkedList; + import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import org.hibernate.Query; import org.hibernate.Session;
import java.sql.Types; @@ -213,6 +216,43 @@ public class ServerFactory extends HibernateFactory { }
/** + * Looks up server objects from the given list of server IDs. + * + * If more than 1000 servers are present in the list we'll split it into + * chunks as this can cause problems on Oracle. + * + * @param serverIds List of server IDs. + * @param user who wants to lookup the Server + * @return list of server objects + */ + public static List<Server> lookupByIdsAndUser(List<Long> serverIds, User user) { + Session session = HibernateFactory.getSession(); + Query query = session.getNamedQuery("Server.findByIdsAndOrgId") + .setParameter("orgId", user.getOrg().getId()); + if (serverIds.size() < 1000) { + query.setParameterList("serverIds", serverIds); + return query.list(); + } + + List<Server> results = new LinkedList<Server>(); + List<Long> blockOfIds = new LinkedList<Long>(); + for (Long sid : serverIds) { + blockOfIds.add(sid); + if (blockOfIds.size() == 999) { + query.setParameterList("serverIds", blockOfIds); + results.addAll(query.list()); + blockOfIds = new LinkedList<Long>(); + } + } + // Deal with the remainder: + if (blockOfIds.size() > 0) { + query.setParameterList("serverIds", blockOfIds); + results.addAll(query.list()); + } + return results; + } + + /** * Lookup a Server by their id * @param id the id to search for * @return the Server found diff --git a/java/code/src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml b/java/code/src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml index b938eef..0fde884 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml @@ -176,6 +176,9 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" <![CDATA[from com.redhat.rhn.domain.server.Server as s where s.id = :sid and ORG_ID = :orgId]]> </query>
+ <query name="Server.findByIdsAndOrgId"> + <![CDATA[from com.redhat.rhn.domain.server.Server as s where ORG_ID = :orgId and s.id in (:serverIds)]]> + </query>
<sql-query name="Server.findVirtPlatformHostsByOrg"> <![CDATA[select s.id as id, s.name as name, count(vi.id) as count 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 1577bf5..9e32dcf 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 @@ -14,14 +14,24 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.ssm;
+import java.util.Date; +import java.util.List; +import java.util.Set; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.action.DynaActionForm; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.messaging.MessageQueue; import com.redhat.rhn.common.util.DatePicker; -import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.SetLabels; -import com.redhat.rhn.frontend.dto.EssentialServerDto; -import com.redhat.rhn.frontend.dto.PackageListItem; +import com.redhat.rhn.frontend.events.SsmInstallPackagesEvent; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnHelper; import com.redhat.rhn.frontend.struts.RhnListAction; @@ -29,30 +39,11 @@ import com.redhat.rhn.frontend.struts.SessionSetHelper; import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.frontend.taglibs.list.helper.Listable; -import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.system.SystemManager;
-import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.action.DynaActionForm; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * SSM action that handles prompting the user for when to install the package as well * as creating the action when the user confirms the creation. - * - * @version $Revision$ */ public class SchedulePackageInstallationAction extends RhnListAction implements Listable {
@@ -72,7 +63,37 @@ public class SchedulePackageInstallationAction extends RhnListAction implements
if (request.getParameter("dispatch") != null) { if (requestContext.wasDispatched("installconfirm.jsp.confirm")) { - return executePackageAction(actionMapping, actionForm, request, response); + + StrutsDelegate strutsDelegate = getStrutsDelegate(); + + // Load data from the web components + User user = requestContext.getLoggedInUser(); + Date earliest = getStrutsDelegate().readDatePicker( + (DynaActionForm) actionForm, "date", DatePicker.YEAR_RANGE_POSITIVE); + Long cid = requestContext.getRequiredParam(RequestContext.CID); + + String packagesDecl = request.getParameter("packagesDecl"); + + Set<String> data = SessionSetHelper.lookupAndBind(request, packagesDecl); + + // Remove the packages from session once we have the above handle on them + SessionSetHelper.obliterate(request, packagesDecl); + + // Fire off the request on the message queue + SsmInstallPackagesEvent event = + new SsmInstallPackagesEvent(user.getId(), earliest, data, cid); + MessageQueue.publish(event); + + ActionMessages msgs = new ActionMessages(); + + // Check to determine to display single or plural confirmation message + int numPackages = data.size(); + LocalizationService l10n = LocalizationService.getInstance(); + msgs.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("ssm.package.install.message.packageinstalls")); + strutsDelegate.saveMessages(request, msgs); + + return actionMapping.findForward("confirm"); }
} @@ -103,81 +124,4 @@ public class SchedulePackageInstallationAction extends RhnListAction implements return dataResult; }
- /** - * Creates the package installation action. - * <p/> - * Note: this can probably be removed in place of the code in - * BaseSystemPackagesConfirmAction. I rewrote most of the logic for now since I don't - * yet have a good plan for refactoring that method to support multiple servers. - * - * @param mapping struts mapping - * @param formIn struts form - * @param request HTTP request - * @param response HTTP response - * @return - */ - private ActionForward executePackageAction(ActionMapping mapping, - ActionForm formIn, - HttpServletRequest request, - HttpServletResponse response) { - - RequestContext context = new RequestContext(request); - StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = context.getLoggedInUser(); - - // Load the package list - String packagesDecl = request.getParameter("packagesDecl"); - - Set<String> data = SessionSetHelper.lookupAndBind(request, packagesDecl); - int numPackages = data.size(); - - // Convert the package list to domain objects - List<PackageListItem> packageListItems = - new ArrayList<PackageListItem>(numPackages); - for (String key : data) { - packageListItems.add(PackageListItem.parse(key)); - } - - // Convert to list of maps - List<Map<String, Long>> packageListData = - PackageListItem.toKeyMaps(packageListItems); - - // Load the date selected by the user - Date earliest = getStrutsDelegate().readDatePicker((DynaActionForm) formIn, - "date", DatePicker.YEAR_RANGE_POSITIVE); - - // Create one action for all servers to which the packages are installed - List<EssentialServerDto> servers = getResult(context); - List<Server> actionServers = new ArrayList<Server>(servers.size()); - for (EssentialServerDto dto : servers) { - Long sid = dto.getId(); - Server server = SystemManager.lookupByIdAndUser(sid, user); - actionServers.add(server); - } - - ActionManager.schedulePackageInstall(user, actionServers, - packageListData, earliest); - - // Remove the packages from session - SessionSetHelper.obliterate(request, packagesDecl); - - ActionMessages msgs = new ActionMessages(); - - // Check to determine to display single or plural confirmation message - LocalizationService l10n = LocalizationService.getInstance(); - if (numPackages == 1) { - msgs.add(ActionMessages.GLOBAL_MESSAGE, - new ActionMessage("ssm.package.install.message.packageinstall", - l10n.formatNumber(numPackages))); - } - else { - msgs.add(ActionMessages.GLOBAL_MESSAGE, - new ActionMessage("ssm.package.install.message.packageinstalls", - l10n.formatNumber(numPackages))); - } - strutsDelegate.saveMessages(request, msgs); - - return mapping.findForward("confirm"); - } - } 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 b2670b9..b13e0f8 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 @@ -15,13 +15,15 @@ package com.redhat.rhn.frontend.action.rhnpackage.ssm;
import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.common.localization.LocalizationService; + +import com.redhat.rhn.common.messaging.MessageQueue; import com.redhat.rhn.common.util.DatePicker; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.SetCleanup; -import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.PackageListItem; + +import com.redhat.rhn.frontend.events.SsmRemovePackagesEvent; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnHelper; import com.redhat.rhn.frontend.struts.RhnListAction; @@ -30,11 +32,12 @@ import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.frontend.taglibs.list.TagHelper; import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.frontend.taglibs.list.helper.Listable; -import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.log4j.Logger; + import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -42,12 +45,8 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.action.DynaActionForm;
-import java.util.ArrayList; import java.util.Date; -import java.util.HashSet; -import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set;
import javax.servlet.http.HttpServletRequest; @@ -56,11 +55,11 @@ import javax.servlet.http.HttpServletResponse; /** * Handles the display and capture of scheduling package removals for systems in the SSM. * - * @version $Revision$ */ public class SchedulePackageRemoveAction extends RhnListAction implements Listable {
private static final String DATA_SET = "pageList"; + private static Logger log = Logger.getLogger(SchedulePackageRemoveAction.class);
/** {@inheritDoc} */ public ActionForward execute(ActionMapping actionMapping, @@ -143,81 +142,29 @@ public class SchedulePackageRemoveAction extends RhnListAction implements Listab Date earliest = getStrutsDelegate().readDatePicker((DynaActionForm) formIn, "date", DatePicker.YEAR_RANGE_POSITIVE);
+ log.debug("Getting package removal data."); // Parse through all of the results DataResult result = (DataResult) getResult(context); result.elaborate(); - - int numPackages = 0; - - /* 443500 - The following was changed to be able to stuff all of the package - removals into a single action. The schedule package removal page will display - a fine grained mapping of server to package removed (taking into account to - only show packages that exist on the server). - - However, there is no issue in requesting a client delete a package it doesn't - have. So when we create the action, populate it with all packages and for - every server to which any package removal applies. This will let us keep all - of the removals coupled under a single scheduled action and won't cause an - issue on the client when the scheduled removals are picked up. - - jdobies, Apr 8, 2009 - */ - - // The package collection is a set to prevent duplciates when keeping a running - // total of all packages selected - Set<PackageListItem> allPackages = new HashSet<PackageListItem>(); - List<Server> allServers = new ArrayList<Server>(result.size()); - - for (Iterator it = result.iterator(); it.hasNext();) { - - // Add action for each package found in the elaborator - Map data = (Map) it.next(); - - // Load the server - Long sid = (Long)data.get("id"); - Server server = SystemManager.lookupByIdAndUser(sid, user); - allServers.add(server); - - // Get the packages out of the elaborator - List elabList = (List) data.get("elaborator0"); - numPackages += elabList.size(); - - for (Iterator elabIt = elabList.iterator(); elabIt.hasNext();) { - Map elabData = (Map) elabIt.next(); - String idCombo = (String) elabData.get("id_combo"); - PackageListItem item = PackageListItem.parse(idCombo); - allPackages.add(item); - } - }
- // Convert to list of maps - List<PackageListItem> allPackagesList = new ArrayList<PackageListItem>(allPackages); - List<Map<String, Long>> packageListData = - PackageListItem.toKeyMaps(allPackagesList); - - // Create the action - ActionManager.schedulePackageRemoval(user, allServers, packageListData, earliest); + log.debug("Publishing schedule package remove event to message queue."); + SsmRemovePackagesEvent event = new SsmRemovePackagesEvent(user.getId(), earliest, + result); + MessageQueue.publish(event);
+ log.debug("Clearing set."); // Remove the packages from session and the DB SessionSetHelper.obliterate(request, request.getParameter("packagesDecl"));
+ log.debug("Deleting set."); RhnSetManager.deleteByLabel(user.getId(), RhnSetDecl.SSM_REMOVE_PACKAGES_LIST.getLabel());
ActionMessages msgs = new ActionMessages();
// Check to determine to display single or plural confirmation message - LocalizationService l10n = LocalizationService.getInstance(); - if (numPackages == 1) { - msgs.add(ActionMessages.GLOBAL_MESSAGE, - new ActionMessage("ssm.package.remove.message.packageremoval", - l10n.formatNumber(numPackages))); - } - else { - msgs.add(ActionMessages.GLOBAL_MESSAGE, - new ActionMessage("ssm.package.remove.message.packageremovals", - l10n.formatNumber(numPackages))); - } + msgs.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("ssm.package.remove.message.packageremovals")); strutsDelegate.saveMessages(request, msgs);
return mapping.findForward("confirm"); 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 bbaecea..3a1a4f3 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 @@ -15,13 +15,17 @@ package com.redhat.rhn.frontend.action.rhnpackage.ssm;
import com.redhat.rhn.common.db.datasource.DataResult; + +import com.redhat.rhn.common.messaging.MessageQueue; import com.redhat.rhn.common.util.DatePicker; import com.redhat.rhn.domain.rhnpackage.PackageEvr; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.SetCleanup; -import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.rhnset.RhnSetElement; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.PackageListItem; + +import com.redhat.rhn.frontend.events.SsmUpgradePackagesEvent; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnHelper; @@ -30,12 +34,13 @@ import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.frontend.taglibs.list.TagHelper; import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.frontend.taglibs.list.helper.Listable; -import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.system.SystemManager;
import org.apache.commons.lang.StringUtils; + +import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -43,13 +48,12 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.action.DynaActionForm;
-import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.ArrayList;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -60,6 +64,7 @@ import javax.servlet.http.HttpServletResponse; public class SchedulePackageUpgradeAction extends RhnAction implements Listable {
private static final String DATA_SET = "pageList"; + private static Logger log = Logger.getLogger(SchedulePackageUpgradeAction.class);
/** {@inheritDoc} */ public ActionForward execute(ActionMapping actionMapping, @@ -173,41 +178,32 @@ public class SchedulePackageUpgradeAction extends RhnAction implements Listable Date earliest = getStrutsDelegate().readDatePicker((DynaActionForm) formIn, "date", DatePicker.YEAR_RANGE_POSITIVE);
- // Parse through all of the results + log.debug("Getting package upgrade data."); DataResult result = (DataResult) getResult(context); - result.elaborate();
- // Loop over each server that will have packages upgraded - for (Iterator it = result.iterator(); it.hasNext();) { - - // Add action for each package found in the elaborator - Map data = (Map) it.next(); - - // Load the server - Long sid = (Long)data.get("id"); - Server server = SystemManager.lookupByIdAndUser(sid, user); + RhnSet packageSet = RhnSetDecl.SSM_UPGRADE_PACKAGES_LIST.get(user); + Set<RhnSetElement> packageElements = packageSet.getElements();
- // Get the packages out of the elaborator - List elabList = (List) data.get("elaborator0"); + List<Map<String, Long>> packageListItems = + new ArrayList<Map<String, Long>>(packageElements.size()); + for (RhnSetElement packageElement : packageElements) { + Map<String, Long> keyMap = new HashMap<String, Long>(); + keyMap.put("name_id", packageElement.getElement()); + keyMap.put("evr_id", packageElement.getElementTwo()); + keyMap.put("arch_id", packageElement.getElementThree());
- List<PackageListItem> items = new ArrayList<PackageListItem>(elabList.size()); - for (Iterator elabIt = elabList.iterator(); elabIt.hasNext();) { - Map elabData = (Map) elabIt.next(); - String idCombo = (String) elabData.get("id_combo"); - PackageListItem item = PackageListItem.parse(idCombo); - items.add(item); - } - - // Convert to list of maps - List<Map<String, Long>> packageListData = PackageListItem.toKeyMaps(items); - - // Create the action - ActionManager.schedulePackageUpgrade(user, server, packageListData, earliest); + packageListItems.add(keyMap); } - + + log.debug("Publishing schedule package upgrade event to message queue."); + SsmUpgradePackagesEvent event = new SsmUpgradePackagesEvent(user.getId(), earliest, + result, packageListItems); + MessageQueue.publish(event); + // Remove the packages from session and the DB SessionSetHelper.obliterate(request, request.getParameter("packagesDecl"));
+ log.debug("Deleting set."); RhnSetManager.deleteByLabel(user.getId(), RhnSetDecl.SSM_UPGRADE_PACKAGES_LIST.getLabel());
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 48ff23c..44994b1 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 @@ -14,14 +14,26 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.ssm;
+import java.util.Date; +import java.util.List; +import java.util.Set; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.action.DynaActionForm; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.messaging.MessageQueue; import com.redhat.rhn.common.util.DatePicker; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.SetCleanup; -import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.PackageListItem; +import com.redhat.rhn.frontend.events.SsmVerifyPackagesEvent; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnHelper; @@ -30,33 +42,13 @@ import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.frontend.taglibs.list.TagHelper; import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.frontend.taglibs.list.helper.Listable; -import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.system.SystemManager;
-import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.action.DynaActionForm; - -import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** - * Handles the display and capturing of scheduling package verifications for systems in + * Handles the display and capturing of scheduling package verifications for systems in * the SSM. - * - * @version $Revision$ */ public class SchedulePackageVerifyAction extends RhnAction implements Listable {
@@ -76,7 +68,39 @@ public class SchedulePackageVerifyAction extends RhnAction implements Listable {
if (request.getParameter("dispatch") != null) { if (requestContext.wasDispatched("installconfirm.jsp.confirm")) { - return executePackageAction(actionMapping, actionForm, request, response); + + RequestContext context = new RequestContext(request); + StrutsDelegate strutsDelegate = getStrutsDelegate(); + User user = context.getLoggedInUser(); + + // Load the date selected by the user + Date earliest = getStrutsDelegate().readDatePicker( + (DynaActionForm) actionForm, "date", DatePicker.YEAR_RANGE_POSITIVE); + + // Parse through all of the results + DataResult result = (DataResult) getResult(context); + result.elaborate(); + + int numPackages = result.size(); + + // Remove the packages from session and the DB + SessionSetHelper.obliterate(request, request.getParameter("packagesDecl")); + + RhnSetManager.deleteByLabel(user.getId(), + RhnSetDecl.SSM_VERIFY_PACKAGES_LIST.getLabel()); + + SsmVerifyPackagesEvent event = + new SsmVerifyPackagesEvent(user.getId(), earliest, result); + MessageQueue.publish(event); + + // Check to determine to display single or plural confirmation message + ActionMessages msgs = new ActionMessages(); + LocalizationService l10n = LocalizationService.getInstance(); + msgs.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("ssm.package.verify.message.packageverifications")); + strutsDelegate.saveMessages(request, msgs); + + return actionMapping.findForward("confirm"); } }
@@ -101,7 +125,7 @@ public class SchedulePackageVerifyAction extends RhnAction implements Listable { String packagesDecl = (String) request.getAttribute("packagesDecl"); if (packagesDecl != null) { Set<String> data = SessionSetHelper.lookupAndBind(request, packagesDecl); - + RhnSet packageSet = RhnSetManager.createSet(user.getId(), RhnSetDecl.SSM_VERIFY_PACKAGES_LIST.getLabel(), SetCleanup.NOOP);
@@ -109,10 +133,10 @@ public class SchedulePackageVerifyAction extends RhnAction implements Listable { PackageListItem item = PackageListItem.parse(idCombo); packageSet.addElement(item.getIdOne(), item.getIdTwo(), item.getIdThree()); } - + RhnSetManager.store(packageSet); } - + DataResult results = SystemManager.ssmSystemPackagesToRemove(user, RhnSetDecl.SSM_VERIFY_PACKAGES_LIST.getLabel());
@@ -121,85 +145,4 @@ public class SchedulePackageVerifyAction extends RhnAction implements Listable { return results; }
- /** - * Creates the package verification action. - * - * @param mapping struts mapping - * @param formIn struts form - * @param request HTTP request - * @param response HTTP response - * @return - */ - private ActionForward executePackageAction(ActionMapping mapping, - ActionForm formIn, - HttpServletRequest request, - HttpServletResponse response) { - - RequestContext context = new RequestContext(request); - StrutsDelegate strutsDelegate = getStrutsDelegate(); - User user = context.getLoggedInUser(); - - // Load the date selected by the user - Date earliest = getStrutsDelegate().readDatePicker((DynaActionForm) formIn, - "date", DatePicker.YEAR_RANGE_POSITIVE); - - // Parse through all of the results - DataResult result = (DataResult) getResult(context); - result.elaborate(); - - int numPackages = 0; - - // Loop over each server that will have packages upgraded - for (Iterator it = result.iterator(); it.hasNext();) { - - // Add action for each package found in the elaborator - Map data = (Map) it.next(); - - // Load the server - Long sid = (Long)data.get("id"); - Server server = SystemManager.lookupByIdAndUser(sid, user); - - // Get the packages out of the elaborator - List elabList = (List) data.get("elaborator0"); - numPackages += elabList.size(); - - List<PackageListItem> items = new ArrayList<PackageListItem>(elabList.size()); - for (Iterator elabIt = elabList.iterator(); elabIt.hasNext();) { - Map elabData = (Map) elabIt.next(); - String idCombo = (String) elabData.get("id_combo"); - PackageListItem item = PackageListItem.parse(idCombo); - items.add(item); - } - - // Convert to list of maps - List<Map<String, Long>> packageListData = PackageListItem.toKeyMaps(items); - - // Create the action - ActionManager.schedulePackageVerify(user, server, packageListData, earliest); - } - - // Remove the packages from session and the DB - SessionSetHelper.obliterate(request, request.getParameter("packagesDecl")); - - RhnSetManager.deleteByLabel(user.getId(), - RhnSetDecl.SSM_VERIFY_PACKAGES_LIST.getLabel()); - - ActionMessages msgs = new ActionMessages(); - - // Check to determine to display single or plural confirmation message - LocalizationService l10n = LocalizationService.getInstance(); - if (numPackages == 1) { - msgs.add(ActionMessages.GLOBAL_MESSAGE, - new ActionMessage("ssm.package.verify.message.packageverification", - l10n.formatNumber(numPackages))); - } - else { - msgs.add(ActionMessages.GLOBAL_MESSAGE, - new ActionMessage("ssm.package.verify.message.packageverifications", - l10n.formatNumber(numPackages))); - } - strutsDelegate.saveMessages(request, msgs); - - return mapping.findForward("confirm"); - } } diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java new file mode 100644 index 0000000..77c4024 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java @@ -0,0 +1,110 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.events; + +import com.redhat.rhn.domain.user.UserFactory; + +import java.util.Set; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.Date; +import java.util.LinkedList; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import com.redhat.rhn.common.messaging.EventMessage; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.manager.ssm.SsmOperationManager; +import com.redhat.rhn.manager.action.ActionManager; +import com.redhat.rhn.manager.rhnset.RhnSetDecl; +import com.redhat.rhn.manager.system.SystemManager; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.server.ServerFactory; +import com.redhat.rhn.frontend.dto.PackageListItem; +import com.redhat.rhn.frontend.dto.EssentialServerDto; +import com.redhat.rhn.frontend.action.SetLabels; + +/** + * Schedules package installations on systems in the SSM. + */ +public class SsmInstallPackagesAction extends AbstractDatabaseAction { + + private final Log log = LogFactory.getLog(this.getClass()); + + protected void doExecute(EventMessage msg) { + SsmInstallPackagesEvent event = (SsmInstallPackagesEvent) msg; + + User user = UserFactory.lookupById(event.getUserId()); + + // Log the action has been created + LocalizationService ls = LocalizationService.getInstance(); + String operationMessage = ls.getMessage("ssm.package.install.operationname"); + long operationId = + SsmOperationManager.createOperation(user, + operationMessage, RhnSetDecl.SYSTEMS.getLabel()); + + try { + scheduleInstalls(event, user); + } + catch (Exception e) { + log.error("Error scheduling package installations for event " + event, e); + } + finally { + // This should stay in the finally block so the operation is + // not perpetually left in an in progress state + SsmOperationManager.completeOperation(user, operationId); + } + } + + private void scheduleInstalls(SsmInstallPackagesEvent event, User user) { + + log.debug("Scheduling package installations."); + Date earliest = event.getEarliest(); + Set<String> data = event.getPackages(); + Long channelId = event.getChannelId(); + + List<EssentialServerDto> servers = + SystemManager.systemsSubscribedToChannelInSet(channelId, user, + SetLabels.SYSTEM_LIST); + + // Convert the package list to domain objects + List<PackageListItem> packageListItems = + new ArrayList<PackageListItem>(data.size()); + for (String key : data) { + packageListItems.add(PackageListItem.parse(key)); + } + + // Convert to list of maps + List<Map<String, Long>> packageListData = + PackageListItem.toKeyMaps(packageListItems); + + // Create one action for all servers to which the packages are installed + List<Server> actionServers = new ArrayList<Server>(servers.size()); + List<Long> serverIds = new LinkedList<Long>(); + for (EssentialServerDto dto : servers) { + serverIds.add(dto.getId()); + } + log.debug("Looking up server objects."); + actionServers.addAll(ServerFactory.lookupByIdsAndUser(serverIds, user)); + log.debug("Scheduling actions."); + + + ActionManager.schedulePackageInstall(user, actionServers, + packageListData, earliest); + log.debug("Done scheduling package installations."); + + } +} diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesEvent.java b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesEvent.java new file mode 100644 index 0000000..2559733 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesEvent.java @@ -0,0 +1,103 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.events; + +import java.util.Date; +import java.util.Set; +import com.redhat.rhn.common.messaging.EventMessage; + +/** + * Event fired to carry the information necessary to schedule package installations + * on systems in the SSM. + */ +public class SsmInstallPackagesEvent implements EventMessage { + + private Long userId; + private Date earliest; + private Set<String> packages; + private Long channelId; + + /** + * Creates a new event to install a set of packages on systems in the SSM. + * + * @param userIdIn user making the changes; cannot be <code>null</code> + * @param earliestIn earliest time to perform the installation; + * can be <code>null</code> + * @param packagesIn set of package IDs being installed; cannot be <code>null</code> + * @param channelIdIn identifies the channel the packages are installed from; + * cannot be <code>null</code> + */ + public SsmInstallPackagesEvent(Long userIdIn, + Date earliestIn, + Set<String> packagesIn, + Long channelIdIn) { + if (userIdIn == null) { + throw new IllegalArgumentException("userIdIn cannot be null"); + } + + if (packagesIn == null) { + throw new IllegalArgumentException("packagesIn cannot be null"); + } + + if (channelIdIn == null) { + throw new IllegalArgumentException("channelIdIn cannot be null"); + } + + + this.userId = userIdIn; + this.earliest = earliestIn; + this.packages = packagesIn; + this.channelId = channelIdIn; + } + + /** + * @return will not be <code>null</code> + */ + public Long getUserId() { + return userId; + } + + /** + * @return may be <code>null</code> + */ + public Date getEarliest() { + return earliest; + } + + /** + * @return will not be <code>null</code> + */ + public Set<String> getPackages() { + return packages; + } + + /** + * @return will not be <code>null</code> + */ + public Long getChannelId() { + return channelId; + } + + /** {@inheritDoc} */ + public String toText() { + return toString(); + } + + /** {@inheritDoc} */ + public String toString() { + return "SsmPackageInstallEvent[User: " + userId + ", Package Count: " + + packages.size() + ", Channel ID: " + channelId + "]"; + } +} diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java new file mode 100644 index 0000000..994d7bf --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java @@ -0,0 +1,129 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.events; + +import com.redhat.rhn.common.db.datasource.DataResult; + +import com.redhat.rhn.common.localization.LocalizationService; + +import com.redhat.rhn.common.messaging.EventMessage; + +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.server.ServerFactory; + +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.domain.user.UserFactory; + +import com.redhat.rhn.frontend.dto.PackageListItem; + +import com.redhat.rhn.manager.action.ActionManager; + +import com.redhat.rhn.manager.ssm.SsmOperationManager; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.log4j.Logger; + +/** + * Handles removing packages from servers in the SSM. + * + * @see com.redhat.rhn.frontend.events.SsmRemovePackagesEvent + * @version $Revision$ + */ +public class SsmRemovePackagesAction extends AbstractDatabaseAction { + private static Logger log = Logger.getLogger(SsmRemovePackagesAction.class); + + /** {@inheritDoc} */ + protected void doExecute(EventMessage msg) { + log.debug("Executing package removals."); + SsmRemovePackagesEvent event = (SsmRemovePackagesEvent) msg; + + DataResult result = event.getResult(); + User user = UserFactory.lookupById(event.getUserId()); + Date earliest = event.getEarliest(); + + LocalizationService ls = LocalizationService.getInstance(); + long operationId = SsmOperationManager.createOperation(user, + ls.getMessage("ssm.package.remove.operationname"), null); + int numPackages = 0; + + /* 443500 - The following was changed to be able to stuff all of the package + removals into a single action. The schedule package removal page will display + a fine grained mapping of server to package removed (taking into account to + only show packages that exist on the server). + + However, there is no issue in requesting a client delete a package it doesn't + have. So when we create the action, populate it with all packages and for + every server to which any package removal applies. This will let us keep all + of the removals coupled under a single scheduled action and won't cause an + issue on the client when the scheduled removals are picked up. + + jdobies, Apr 8, 2009 + */ + + // The package collection is a set to prevent duplciates when keeping a running + // total of all packages selected + Set<PackageListItem> allPackages = new HashSet<PackageListItem>(); + + // Looking up all the server objects in Hibernate was *brutally* slow here: + List<Long> allServerIds = new LinkedList<Long>(); + + // Iterate the data, which is essentially each unique package/server combination + // to remove. Note that this is only for servers that we have marked as having the + // package installed. + log.debug("Iterating data."); + for (Iterator it = result.iterator(); it.hasNext();) { + + // Add action for each package found in the elaborator + Map data = (Map) it.next(); + + // Load the server + Long sid = (Long)data.get("id"); + allServerIds.add(sid); + + // Get the packages out of the elaborator + List elabList = (List) data.get("elaborator0"); + numPackages += elabList.size(); + + for (Iterator elabIt = elabList.iterator(); elabIt.hasNext();) { + Map elabData = (Map) elabIt.next(); + String idCombo = (String) elabData.get("id_combo"); + PackageListItem item = PackageListItem.parse(idCombo); + allPackages.add(item); + } + } + + List<Server> allServers = new ArrayList<Server>(result.size()); + allServers.addAll(ServerFactory.lookupByIdsAndUser(allServerIds, user)); + + log.debug("Converting data to maps."); + List<PackageListItem> allPackagesList = new ArrayList<PackageListItem>(allPackages); + List<Map<String, Long>> packageListData = + PackageListItem.toKeyMaps(allPackagesList); + + log.debug("Scheduling package removals."); + ActionManager.schedulePackageRemoval(user, allServers, packageListData, earliest); + log.debug("Done."); + } + +} + diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesEvent.java b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesEvent.java new file mode 100644 index 0000000..8d210e9 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesEvent.java @@ -0,0 +1,87 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.events; + +import com.redhat.rhn.common.db.datasource.DataResult; + +import com.redhat.rhn.common.messaging.EventMessage; + +import java.util.Date; + +/** + * Event fired to carry the information necessary to remove packages from servers in the + * SSM. + * + * @see com.redhat.rhn.frontend.events.SsmRemovePackagesAction + * @version $Revision$ + */ +public class SsmRemovePackagesEvent implements EventMessage { + + private Long userId; + private Date earliest; + private DataResult result; + + /** + * Creates a new SSM remove packages event. + * + * @param userIdIn ID of user scheduling this action. + * @param earliestIn Earliest data action can be picked up. + * @param resultIn Complex map of which packages we're removing from which servers. + */ + public SsmRemovePackagesEvent(Long userIdIn, Date earliestIn, DataResult resultIn) { + userId = userIdIn; + earliest = earliestIn; + result = resultIn; + } + + /** {@inheritDoc} */ + public String toText() { + return toString(); + } + + /** {@inheritDoc} */ + public String toString() { + return "SsmRemovePackagesEvent[User ID: " + userId + "]"; + } + + /** + * Gets the user for this instance. + * + * @return The user. + */ + public Long getUserId() { + return this.userId; + } + + /** + * Gets the earliest for this instance. + * + * @return The earliest. + */ + public Date getEarliest() { + return this.earliest; + } + + /** + * Gets the result for this instance. + * + * @return The result. + */ + public DataResult getResult() { + return this.result; + } + +} + diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java new file mode 100644 index 0000000..fc354bc --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java @@ -0,0 +1,96 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.events; + +import java.util.ArrayList; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import org.apache.log4j.Logger; +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.messaging.EventMessage; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.server.ServerFactory; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.domain.user.UserFactory; +import com.redhat.rhn.manager.action.ActionManager; +import com.redhat.rhn.manager.ssm.SsmOperationManager; + +/** + * Handles removing packages from servers in the SSM. + * + * @see com.redhat.rhn.frontend.events.SsmUpgradePackagesEvent + */ +public class SsmUpgradePackagesAction extends AbstractDatabaseAction { + + private static Logger log = Logger.getLogger(SsmUpgradePackagesAction.class); + + /** {@inheritDoc} */ + protected void doExecute(EventMessage msg) { + log.debug("Executing package upgrades."); + + SsmUpgradePackagesEvent event = (SsmUpgradePackagesEvent) msg; + User user = UserFactory.lookupById(event.getUserId()); + + LocalizationService ls = LocalizationService.getInstance(); + long operationId = SsmOperationManager.createOperation(user, + ls.getMessage("ssm.package.upgrade.operationname"), null); + + // Explicitly call handle transactions here so the operation creation above + // is persisted before the potentially long running logic below + handleTransactions(); + + try { + scheduleUpgrades(user, event); + } + catch (Exception e) { + log.error("Error while scheduling package upgrades for event: " + event, e); + } + finally { + SsmOperationManager.completeOperation(user, operationId); + } + + log.debug("Done."); + } + + private void scheduleUpgrades(User user, SsmUpgradePackagesEvent event) { + + long actionStart = System.currentTimeMillis(); + + DataResult result = event.getResult(); + Date earliest = event.getEarliest(); + List<Map<String, Long>> packageListItems = event.getPackageListItems(); + + // Migrate server data result into a single list for lookup + List<Long> serverIds = new ArrayList<Long>(result.size()); + for (Iterator it = result.iterator(); it.hasNext();) { + Map data = (Map) it.next(); + Long serverId = (Long) data.get("id"); + serverIds.add(serverId); + } + + List<Server> serverList = ServerFactory.lookupByIdsAndUser(serverIds, user); + ActionManager.schedulePackageUpgrades(user, serverList, packageListItems, earliest); + + if (log.isDebugEnabled()) { + log.debug("Time to schedule all actions: " + + (System.currentTimeMillis() - actionStart)); + } + } + +} + diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesEvent.java b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesEvent.java new file mode 100644 index 0000000..9264597 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesEvent.java @@ -0,0 +1,100 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.events; + +import com.redhat.rhn.common.db.datasource.DataResult; + +import com.redhat.rhn.common.messaging.EventMessage; + +import java.util.Date; +import java.util.Map; +import java.util.List; + +/** + * Event fired to carry the information necessary to upgrade packages on servers in the + * SSM. + * + * @see com.redhat.rhn.frontend.events.SsmUpgradePackagesAction + */ +public class SsmUpgradePackagesEvent implements EventMessage { + + private Long userId; + private Date earliest; + private DataResult result; + private List<Map<String, Long>> packageListItems; + + /** + * Creates a new SSM upgrade packages event. + * + * @param userIdIn ID of user scheduling this action. + * @param earliestIn Earliest data action can be picked up. + * @param resultIn Complex map of which packages we're upgrading on which servers. + * @param listIn packages to upgrade + */ + public SsmUpgradePackagesEvent(Long userIdIn, Date earliestIn, + DataResult resultIn, List<Map<String, Long>> listIn) { + userId = userIdIn; + earliest = earliestIn; + result = resultIn; + packageListItems = listIn; + } + + /** {@inheritDoc} */ + public String toText() { + return toString(); + } + + /** {@inheritDoc} */ + public String toString() { + return "SsmUpgradePackagesEvent[User ID: " + userId + "]"; + } + + /** + * Gets the user for this instance. + * + * @return The user. + */ + public Long getUserId() { + return this.userId; + } + + /** + * Gets the earliest for this instance. + * + * @return The earliest. + */ + public Date getEarliest() { + return this.earliest; + } + + /** + * Gets the result for this instance. + * + * @return The result. + */ + public DataResult getResult() { + return this.result; + } + + /** + * Gets the packages to upgrade. + * + * @return list suitable for scheduling upgrade actions + */ + public List<Map<String, Long>> getPackageListItems() { + return packageListItems; + } +} + diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmVerifyPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmVerifyPackagesAction.java new file mode 100644 index 0000000..55abd07 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmVerifyPackagesAction.java @@ -0,0 +1,105 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.events; + +import com.redhat.rhn.domain.user.UserFactory; + +import java.util.Iterator; +import java.util.Map; +import java.util.List; +import java.util.ArrayList; +import java.util.Date; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import com.redhat.rhn.common.messaging.EventMessage; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.manager.ssm.SsmOperationManager; +import com.redhat.rhn.manager.rhnset.RhnSetDecl; +import com.redhat.rhn.manager.system.SystemManager; +import com.redhat.rhn.manager.action.ActionManager; +import com.redhat.rhn.frontend.dto.PackageListItem; + +/** + * Schedules package verifications on systems in the SSM. + */ +public class SsmVerifyPackagesAction extends AbstractDatabaseAction { + + private final Log log = LogFactory.getLog(this.getClass()); + + /** {@inheritDoc} */ + protected void doExecute(EventMessage msg) { + SsmVerifyPackagesEvent event = (SsmVerifyPackagesEvent) msg; + + User user = UserFactory.lookupById(event.getUserId()); + + // Log the action has been created + LocalizationService ls = LocalizationService.getInstance(); + String operationMessage = ls.getMessage("ssm.package.verify.operationname"); + long operationId = + SsmOperationManager.createOperation(user, operationMessage, + RhnSetDecl.SYSTEMS.getLabel()); + + try { + scheduleVerifications(event, user); + } + catch (Exception e) { + log.error("Error scheduling package installations for event " + event, e); + } + finally { + // This should stay in the finally block so the operation is + // not perpetually left in an in progress state + SsmOperationManager.completeOperation(user, operationId); + } + + } + + private void scheduleVerifications(SsmVerifyPackagesEvent event, User user) { + + Date earliest = event.getEarliest(); + DataResult result = event.getResult(); + + // Loop over each server that will have packages upgraded + for (Iterator it = result.iterator(); it.hasNext();) { + + // Add action for each package found in the elaborator + Map data = (Map) it.next(); + + // Load the server + Long sid = (Long)data.get("id"); + Server server = SystemManager.lookupByIdAndUser(sid, user); + + // Get the packages out of the elaborator + List elabList = (List) data.get("elaborator0"); + + List<PackageListItem> items = new ArrayList<PackageListItem>(elabList.size()); + for (Iterator elabIt = elabList.iterator(); elabIt.hasNext();) { + Map elabData = (Map) elabIt.next(); + String idCombo = (String) elabData.get("id_combo"); + PackageListItem item = PackageListItem.parse(idCombo); + items.add(item); + } + + // Convert to list of maps for the action call + List<Map<String, Long>> packageListData = PackageListItem.toKeyMaps(items); + + // Create the action + ActionManager.schedulePackageVerify(user, server, packageListData, earliest); + } + + } +} diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmVerifyPackagesEvent.java b/java/code/src/com/redhat/rhn/frontend/events/SsmVerifyPackagesEvent.java new file mode 100644 index 0000000..f39dfca --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmVerifyPackagesEvent.java @@ -0,0 +1,79 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.events; + +import java.util.Date; +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.messaging.EventMessage; + +/** + * Event carrying information necessary to schedule package verifications on systems + * in the SSM. + */ +public class SsmVerifyPackagesEvent implements EventMessage { + + private Long userId; + private Date earliest; + private DataResult result; + + /** + * Creates a new event to trigger the action over the message queue. + * + * @param userIdIn user making the request; cannot be <code>null</code> + * @param earliestIn used for scheduling the verification in the future; + * may be <code>null</code> + * @param resultIn data describing the systems and packages to verify + * cannot be <code>null</code> + */ + public SsmVerifyPackagesEvent(Long userIdIn, Date earliestIn, DataResult resultIn) { + + if (userIdIn == null) { + throw new IllegalArgumentException("userIdIn cannot be null"); + } + + if (resultIn == null) { + throw new IllegalArgumentException("resultIn cannot be null"); + } + + this.userId = userIdIn; + this.earliest = earliestIn; + this.result = resultIn; + } + + /** @return will not be <code>null</code> */ + public Long getUserId() { + return userId; + } + + /** @return may be <code>null</code> */ + public Date getEarliest() { + return earliest; + } + + /** @return will not be <code>null</code> */ + public DataResult getResult() { + return result; + } + + /** {@inheritDoc} */ + public String toText() { + return toString(); + } + + /** {@inheritDoc} */ + public String toString() { + return "SsmPackageVerifyEvent[UserId: " + userId + "]"; + } +} diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 81d8a12..e1e959c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -8269,6 +8269,15 @@ Follow this url to see the full list of inactive systems: <trans-unit id="ssm.provision.scheduled"> <source>Successfully scheduled {0} system(s) for provisioning.</source> </trans-unit> + <trans-unit id="ssm.package.install.operationname"> + <source>Schedule Package Installations</source> + </trans-unit> + <trans-unit id="ssm.package.upgrade.operationname"> + <source>Schedule Package Upgrades</source> + </trans-unit> + <trans-unit id="ssm.package.verify.operationname"> + <source>Schedule Package Verifications</source> + </trans-unit> <trans-unit id="kickstart.cobbler.distro.syncfail"> <source> The following is a list of errors gathered while Spacewalk attempts to 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 3dac7fd..5ab91f4 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 @@ -16068,12 +16068,8 @@ any of these revisions. Are you sure you want to do this?</source> <source>The {0} package you have selected will be installed to the compatible selected systems, listed below:</source> </trans-unit>
- <trans-unit id="ssm.package.install.message.packageinstall"> - <source>{0} package installation has been scheduled</source> - </trans-unit> - <trans-unit id="ssm.package.install.message.packageinstalls"> - <source>{0} package installations have been scheduled</source> + <source>Package installations are being scheduled, it may take several minutes for this to complete.</source> </trans-unit>
</group> @@ -16117,11 +16113,11 @@ any of these revisions. Are you sure you want to do this?</source> <trans-unit id="ssm.package.remove.schedule.toomanypackages"> <source>Package list truncated</source> </trans-unit> - <trans-unit id="ssm.package.remove.message.packageremoval"> - <source>{0} package removal has been scheduled</source> - </trans-unit> <trans-unit id="ssm.package.remove.message.packageremovals"> - <source>{0} package removals have been scheduled</source> + <source>Package removals are being scheduled, it may take several minutes for this to complete. </source> + </trans-unit> + <trans-unit id="ssm.package.remove.operationname"> + <source>Schedule Package Removals</source> </trans-unit> </group>
@@ -16147,6 +16143,9 @@ any of these revisions. Are you sure you want to do this?</source> <trans-unit id="ssm.package.upgrade.select.advisory"> <source>Advisory</source> </trans-unit> + <trans-unit id="ssm.package.upgrade.operationname"> + <source>Schedule Package Upgrades</source> + </trans-unit> </group>
<!-- ssm/packageupgradeschedule.jsp --> @@ -16156,7 +16155,7 @@ any of these revisions. Are you sure you want to do this?</source> </context-group>
<trans-unit id="ssm.package.upgrade.message.packageupgrade"> - <source>Package upgrades scheduled</source> + <source>Package upgrades are being scheduled, it may take several minutes for this to complete. </source> </trans-unit> <trans-unit id="ssm.package.upgrade.schedule.toomanypackages"> <source>Package list truncated</source> @@ -16205,11 +16204,8 @@ any of these revisions. Are you sure you want to do this?</source> <trans-unit id="ssm.package.verify.schedule.toomanypackages"> <source>Package list truncated</source> </trans-unit> - <trans-unit id="ssm.package.verify.message.packageverification"> - <source>{0} package verification has been scheduled</source> - </trans-unit> <trans-unit id="ssm.package.verify.message.packageverifications"> - <source>{0} package verifications have been scheduled</source> + <source>Package verifications are being scheduled, it may take several minutes for this to complete.</source> </trans-unit> </group>
diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java index 84425c5..b98c1a2 100644 --- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java +++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java @@ -1154,6 +1154,19 @@ public class ActionManager extends BaseManager { }
/** + * Schedules one or more package upgrade actions for the given servers. + * Note: package upgrade = package install + * @param scheduler User scheduling the action. + * @param srvr list of servers on which the action affects. + * @param pkgs The set of packages to be removed. + * @param earliestAction Date of earliest action to be executed + */ + public static void schedulePackageUpgrades(User scheduler, + List<Server> srvr, List<Map<String, Long>> pkgs, Date earliestAction) { + schedulePackageInstall(scheduler, srvr, pkgs, earliestAction); + } + + /** * Schedules one or more package upgrade actions for the given server. * Note: package upgrade = package install * @param scheduler User scheduling the action. diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 0407935..a7966a9 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -6487,7 +6487,7 @@ <forward name="default" path="/WEB-INF/pages/ssm/packageinstallschedule.jsp" /> <forward name="confirm" - path="/ssm/Packages.do" /> + path="/ssm/ViewLog.do" /> </action>
<!-- SSM Package Remove Pages --> @@ -6509,7 +6509,7 @@ <forward name="default" path="/WEB-INF/pages/ssm/packageremoveschedule.jsp" /> <forward name="confirm" - path="/ssm/Packages.do"/> + path="/ssm/ViewLog.do"/> </action>
<!-- SSM Package Upgrade Pages --> @@ -6531,7 +6531,7 @@ <forward name="default" path="/WEB-INF/pages/ssm/packageupgradeschedule.jsp" /> <forward name="confirm" - path="/ssm/Packages.do"/> + path="/ssm/ViewLog.do"/> </action>
<!-- SSM Package Verify Pages --> @@ -6553,11 +6553,9 @@ <forward name="default" path="/WEB-INF/pages/ssm/packageverifyschedule.jsp" /> <forward name="confirm" - path="/ssm/Packages.do"/> + path="/ssm/ViewLog.do"/> </action>
- - <action path="/admin/TaskStatus" scope="request" name="datePickerForm"
commit 54405ec279672e299ef04b6a22c312dbef584ed5 Author: Shannon Hughes shughes@redhat.com Date: Mon Jul 13 14:55:02 2009 -0400
509589 - fix for org counts
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml index 4d1dfdb..d3d17c1 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Org_queries.xml @@ -141,6 +141,7 @@ WHERE 1=1 AND sgt.id = sg.group_type AND sgt.label = :label AND sg.max_members > 0 +AND sg.org_id != 1 </query> </mode>
commit 98e5a6363bb11a7266043c0743eb60a67baa22ef Author: Miroslav Suchý msuchy@redhat.com Date: Mon Jul 13 11:33:23 2009 +0200
change order of question during proxy installation
We usually need to copy parent CA cert to /root/sslbuild, so ask this question as soon as possible. I hate when I have to answer questions, which are not used due interrupted installation
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index 047abce..e45daee 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -205,15 +205,6 @@ if [ "$RHN_PARENT" == "rhn.redhat.com" ]; then WARNING fi
-VERSION_FROM_PARENT=$(rhn-proxy-activate --server=$RHN_PARENT --list-available-versions 2>/dev/null|sort|tail -n1) -VERSION_FROM_RPM=$(rpm -q --queryformat %{version} spacewalk-proxy-installer|cut -d. -f1-2) -default_or_input "Proxy version to activate" VERSION ${VERSION_FROM_PARENT:-$VERSION_FROM_RPM} - -default_or_input "Traceback email" TRACEBACK_EMAIL '' - -default_or_input "Use SSL" USE_SSL 'Y/n' -USE_SSL=$(yes_no $USE_SSL) - default_or_input "CA Chain" CA_CHAIN $(awk -F'[=;]' '/sslCACert=/ {a=$2} END { print a}' $SYSCONFIG_DIR/up2date)
if [ 0$FORCE_OWN_CA -eq 0 ] && \ @@ -232,6 +223,16 @@ if ! /sbin/runuser nobody -s /bin/sh --command="[ -r $CA_CHAIN ]" ; then exit 1 fi
+VERSION_FROM_PARENT=$(rhn-proxy-activate --server=$RHN_PARENT --list-available-versions 2>/dev/null|sort|tail -n1) +VERSION_FROM_RPM=$(rpm -q --queryformat %{version} spacewalk-proxy-installer|cut -d. -f1-2) +default_or_input "Proxy version to activate" VERSION ${VERSION_FROM_PARENT:-$VERSION_FROM_RPM} + +default_or_input "Traceback email" TRACEBACK_EMAIL '' + +default_or_input "Use SSL" USE_SSL 'Y/n' +USE_SSL=$(yes_no $USE_SSL) + + default_or_input "HTTP Proxy" HTTP_PROXY ''
if [ "$HTTP_PROXY" != "" ]; then
commit 76555899a9bed06b378e62b744d0ab39ece722fb Author: Miroslav Suchý msuchy@redhat.com Date: Mon Jul 13 11:23:32 2009 +0200
Automatic commit of package [spacewalk-proxy-installer] release [0.6.19-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec index a9a952d..b6d49e6 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer Summary: Spacewalk Proxy Server Installer Group: Applications/Internet License: GPLv2 -Version: 0.6.18 +Version: 0.6.19 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE answers.txt
%changelog +* Mon Jul 13 2009 Miroslav Suchy msuchy@redhat.com 0.6.19-1 +- 509450 - install our jabberd ssl cert during proxy installation + * Mon Jul 06 2009 John Matthews jmatthew@redhat.com 0.6.18-1 - 509522 - remove conflicts and put provides to spacewalk-proxy-management (msuchy@redhat.com) diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer index 0465792..fcf9bbd 100644 --- a/rel-eng/packages/spacewalk-proxy-installer +++ b/rel-eng/packages/spacewalk-proxy-installer @@ -1 +1 @@ -0.6.18-1 proxy/installer/ +0.6.19-1 proxy/installer/
commit 98a88d8b071fc991e4442d7ca9709c3aa6eab99d Author: Miroslav Suchý msuchy@redhat.com Date: Mon Jul 13 10:42:47 2009 +0200
509450 - install our jabberd ssl cert during proxy installation.
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index e590777..047abce 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -334,6 +334,7 @@ fi # / 1024 is to get value in MB SQUID_SIZE=$(df -P /var/spool/squid | awk '{a=$4} END {printf("%d", a * 60 / 100 / 1024)}')
+ln -sf /etc/pki/spacewalk/jabberd/server.pem /etc/jabberd/server.pem sed "s/${session.hostname}/$HOSTNAME/g" < $DIR/c2s.xml > $JABBERD_DIR/c2s.xml sed "s/${session.hostname}/$HOSTNAME/g" < $DIR/sm.xml > $JABBERD_DIR/sm.xml sed "s|cache_dir ufs /var/spool/squid 15000 16 256|cache_dir ufs /var/spool/squid $SQUID_SIZE 16 256|g" \
commit 3f5239f46ed6398ef20b52e5fe00f40fe20afb24 Author: Partha Aji paji@redhat.com Date: Sun Jul 12 12:12:55 2009 -0400
Fixed unit test errors that occured due to the static commit
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 369b9e6..b67fd40 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 @@ -50,13 +50,6 @@ import javax.servlet.http.HttpServletResponse; public class SystemDetailsEditAction extends RhnAction {
public static final String SE_LINUX_PARAM = "selinuxMode"; - - public static final String DHCP_NETWORK_TYPE = "dhcp"; - public static final String NETWORK_TYPE_FORM_VAR = "networkType"; - public static final String DHCP_IF_FORM_VAR = "dhcpNetworkIf"; - private static final String STATIC_IF_FORM_VAR = "staticNetworkIf"; - private static final String DHCP_IF_DISABLED_PARAM = "dhcpIfDisabled"; - private static final String STATIC_IF_DISABLED_PARAM = "staticIfDisabled"; private static final String PWD_CHANGED_PARAM = "pwdChanged";
/** @@ -108,7 +101,6 @@ public class SystemDetailsEditAction extends RhnAction { RequestContext ctx = new RequestContext(request); KickstartData ksdata = lookupKickstart(ctx, dynaForm); prepareForm(dynaForm, ksdata, ctx); - setNetworkIfState(dynaForm, request); request.setAttribute(RequestContext.KICKSTART, ksdata); return mapping.findForward("display"); } @@ -135,8 +127,6 @@ public class SystemDetailsEditAction extends RhnAction { dynaForm.set("rootPasswordConfirm", null); }
- setNetworkIfState(dynaForm, request); - try { transferEdits(dynaForm, ksdata, ctx); ActionMessages msg = new ActionMessages(); @@ -166,25 +156,6 @@ public class SystemDetailsEditAction extends RhnAction { return cmd.getKickstartData(); }
- private void setNetworkIfState(DynaActionForm dynaForm, - HttpServletRequest request) { - String networkType = dynaForm.getString(NETWORK_TYPE_FORM_VAR); - if (networkType != null) { - if (networkType.equals(DHCP_NETWORK_TYPE)) { - request.setAttribute(DHCP_IF_DISABLED_PARAM, Boolean.FALSE - .toString()); - request.setAttribute(STATIC_IF_DISABLED_PARAM, Boolean.TRUE - .toString()); - } - else { - request.setAttribute(DHCP_IF_DISABLED_PARAM, Boolean.TRUE - .toString()); - request.setAttribute(STATIC_IF_DISABLED_PARAM, Boolean.FALSE - .toString()); - } - } - } - private void transferEdits(DynaActionForm form, KickstartData ksdata, RequestContext ctx) { SystemDetailsCommand command = new SystemDetailsCommand(ksdata, ctx diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartSystemDetailsTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartSystemDetailsTest.java index 313a617..cc34f75 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartSystemDetailsTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartSystemDetailsTest.java @@ -74,33 +74,17 @@ public class KickstartSystemDetailsTest extends BaseKickstartEditTestCase { actionPerform(); verifyNoActionErrors(); } - - public void testEditNetworkErr() throws Exception { - setupForDisplay(ksdata); - addRequestParameter("submitted", "true"); - addRequestParameter("networkType", "dhcp"); - addRequestParameter("rootPassword", "blahblah"); - addRequestParameter("rootPasswordConfirm", "blahblah"); - addRequestParameter("pwdChanged", "true"); - actionPerform(); - String[] errMessages = {"kickstart.systemdetails.missing.netdevice.jsp.error"}; - verifyActionErrors(errMessages); - } - + public void testEditNetworkSuccess() throws Exception { setupForEdit(ksdata); addRequestParameter("selinuxMode", "permissive"); - addRequestParameter("networkType", "dhcp"); - addRequestParameter("dhcpNetworkIf", "eth0"); addRequestParameter("rootPassword", "blahblah"); addRequestParameter("rootPasswordConfirm", "blahblah"); addRequestParameter("pwdChanged", "true"); actionPerform(); - verifyFormValue("dhcpNetworkIf", "eth0"); verifyNoActionErrors(); }
- public void testRHEL3Execute() throws Exception { ksdata.getKickstartDefaults().getKstree(). setInstallType(KickstartFactory. @@ -110,10 +94,6 @@ public class KickstartSystemDetailsTest extends BaseKickstartEditTestCase {
setRequestPathInfo("/kickstart/SystemDetailsEdit"); addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString()); - addRequestParameter(SystemDetailsEditAction.NETWORK_TYPE_FORM_VAR, - SystemDetailsEditAction.DHCP_NETWORK_TYPE); - addRequestParameter(SystemDetailsEditAction.DHCP_IF_FORM_VAR, - "eth0"); addRequestParameter(SystemDetailsEditAction.SE_LINUX_PARAM, SELinuxMode.ENFORCING.getValue()); actionPerform(); @@ -132,10 +112,6 @@ public class KickstartSystemDetailsTest extends BaseKickstartEditTestCase { assertNotNull(ksdata.getCommand("selinux")); setRequestPathInfo("/kickstart/SystemDetailsEdit"); addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString()); - addRequestParameter(SystemDetailsEditAction.NETWORK_TYPE_FORM_VAR, - SystemDetailsEditAction.DHCP_NETWORK_TYPE); - addRequestParameter(SystemDetailsEditAction.DHCP_IF_FORM_VAR, - "eth0"); addRequestParameter(SystemDetailsEditAction.SE_LINUX_PARAM, SELinuxMode.ENFORCING.getValue()); actionPerform(); @@ -153,8 +129,6 @@ public class KickstartSystemDetailsTest extends BaseKickstartEditTestCase {
private void setupForEdit(KickstartData k) throws Exception { setupForDisplay(k); - addRequestParameter("submitted", "true"); - addRequestParameter("networkType", "dhcp"); - addRequestParameter("dhcpNetworkIf", "eth0"); + addRequestParameter("submitted", "true"); } } 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 687edba..717683e 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java @@ -1456,18 +1456,18 @@ public class KickstartScheduleCommand extends BaseSystemOperation { }
private ValidatorError validateNetworkInterface() { - boolean nicAvailable = false; if (!StringUtils.isEmpty(networkInterface)) { + boolean nicAvailable = false; for (NetworkInterface nic : server.getNetworkInterfaces()) { if (networkInterface.equals(nic.getName())) { nicAvailable = true; break; } } - } - if (!nicAvailable) { - return new ValidatorError("kickstart.schedule.nosuchdevice", - server.getName(), networkInterface); + if (!nicAvailable) { + return new ValidatorError("kickstart.schedule.nosuchdevice", + server.getName(), networkInterface); + } } return null; } diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index d0a2ab0..0407935 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -610,9 +610,6 @@ type="com.redhat.rhn.frontend.struts.PasswordForm"> <form-property name="ksid" type="java.lang.Long" /> <form-property name="kickstart" type="com.redhat.rhn.domain.kickstart.KickstartData" /> - <form-property name="networkType" type="java.lang.String" /> - <form-property name="dhcpNetworkIf" type="java.lang.String" /> - <form-property name="staticNetworkIf" type="java.lang.String" /> <form-property name="selinuxMode" type="java.lang.String" /> <form-property name="configManagement" type="java.lang.String" /> <form-property name="remoteCommands" type="java.lang.String" />
commit 26aa7de5d7692f814e9f609d47c004f11a6f82f2 Author: Partha Aji paji@redhat.com Date: Sun Jul 12 03:20:58 2009 -0400
510299 - Big commit to get static networking to work
diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py index 1439c2f..b3f77ae 100644 --- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py +++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py @@ -24,10 +24,67 @@ import types import os import popen2 import os.path +import tempfile +import xmlrpclib +import pprint from koan.app import Koan
SHADOW = "/tmp/ks-tree-shadow"
+def execute(cmd): + tmp = tempfile.mktemp() + status = os.system(cmd + " > " + tmp) + data = open(tmp).readlines() + ret = [] + for l in data: + ret.append(string.strip(l)) + if status == 0: + return ret + msg = """Error executing command:\n %s\noutput:\n%s""" + raise Exception(msg % (cmd, string.join(response,"\n"))) + +def find_host_name(): + return execute("hostname")[0] + +def find_netmask(device): + return execute("ifconfig $DEVICE | perl -lne '/Mask:([\d.]+)/ and print $1'")[0] + +def find_ip(device): + return execute("ifconfig $DEVICE | perl -lne '/inet addr:([\d.]+)/ and print $1'")[0] + +def find_name_servers(): + servers = execute("cat /etc/resolv.conf | perl -lne '/^nameserver\s+(\S+)$/ and print $1'") + ret = [] + for s in servers: + if s != "127.0.0.1": + ret.append(s) + return ret + +def find_gateway(): + response = execute("route -n | grep '^0.0.0.0' | awk '{print $2}'") + return response[0] + +def getSystemId(): + path = "/etc/sysconfig/rhn/systemid" + if not os.access(path, os.R_OK): + return None + return open(path, "r").read() + +def update_static_device_records(kickstart_host, static_device): + client = xmlrpclib.Server("https://" + kickstart_host + "/rpc/api") + data = {"gateway": find_gateway(),\ + "nameservers": find_name_servers(),\ + "hostname": find_host_name(),\ + "device" : static_device,\ + "ip": find_ip(static_device),\ + "netmask": find_netmask(static_device)} + msg = """Unable to retrieve the '%s' information needed to update static network configuration information. + Details:\n %s""" + for key, value in data.items(): + if not value: + raise Exception(msg % (key, pprint.pformat(data))) + client.system.setup_static_network(getSystemId(), data) + def initiate(kickstart_host, base, extra_append, static_device=None, system_record="", preserve_files=[]):
error_messages = {} @@ -40,6 +97,9 @@ def initiate(kickstart_host, base, extra_append, static_device=None, system_reco print "Preserve files! : %s" % preserve_files
try: + if static_device: + update_static_device_records(kickstart_host, static_device) + k = Koan() k.list_items = 0 k.server = kickstart_host @@ -62,7 +122,9 @@ def initiate(kickstart_host, base, extra_append, static_device=None, system_reco k.add_reinstall_entry = None k.kopts_override = None k.use_kexec = None - k.embed_kickstart = None + k.embed_kickstart = None + if static_device: + k.embed_kickstart = 1 k.run()
except Exception, e: diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java index ff50c42..895a0c1 100644 --- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java +++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java @@ -141,6 +141,7 @@ public class ConfigDefaults { public static final String VIRT_MEM = "kickstart.virt_mem_size_mb"; public static final String VIRT_CPU = "kickstart.virt_cpus"; public static final String VIRT_DISK = "kickstart.virt_disk_size_gb"; + public static final String KICKSTART_NETWORK_INTERFACE = "kickstart.default_interface";
private ConfigDefaults() { } @@ -376,6 +377,13 @@ public class ConfigDefaults { return Config.get().getString("cobbler.host", "localhost"); }
+ /** + * Returns the default network interface for a kickstart profile + * @return the network interface + */ + public String getDefaultKickstartNetworkInterface() { + return Config.get().getString(KICKSTART_NETWORK_INTERFACE, "eth0"); + }
/** * Return true if this is a Spacewalk instance. (as opposed to Satellite) @@ -387,5 +395,6 @@ public class ConfigDefaults { } return false; } - + + } diff --git a/java/code/src/com/redhat/rhn/common/util/StringUtil.java b/java/code/src/com/redhat/rhn/common/util/StringUtil.java index 5f7d246..d09206a 100644 --- a/java/code/src/com/redhat/rhn/common/util/StringUtil.java +++ b/java/code/src/com/redhat/rhn/common/util/StringUtil.java @@ -747,7 +747,7 @@ public class StringUtil { * @param seperator the seperator to seperate the pairs with * @return the formatted string */ - public static String convertMapToString(Map<String, Object> map, String seperator) { + public static String convertMapToString(Map<String, String> map, String seperator) {
StringBuilder string = new StringBuilder(); for (Object key : map.keySet()) { diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml index 96693c7..d21fb86 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.hbm.xml @@ -33,7 +33,6 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" <property name="kernelParams" column="kernel_params" type="string" length="128" /> <property name="nonChrootPost" column="nonchrootpost" not-null="false" type="yes_no" /> <property name="verboseUp2date" column="verboseup2date" not-null="false" type="yes_no" /> - <property name="staticDevice" column="static_device" type="string" length="32" /> <property name="cobblerId" column="cobbler_id" type="string" length="64" /> <list name="packageNames" table="rhnKickstartPackage" lazy="true"> <key column="kickstart_id"/> diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java index 71bb8ae..61956b5 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java @@ -30,6 +30,7 @@ import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import org.cobbler.CobblerConnection; import org.cobbler.Profile;
import java.util.ArrayList; @@ -68,7 +69,6 @@ public class KickstartData { private String kernelParams; private Boolean nonChrootPost; private Boolean verboseUp2date; - private String staticDevice; private String cobblerId;
private Set cryptoKeys; @@ -300,23 +300,6 @@ public class KickstartData { public void setKernelParams(String kernelParamsIn) { this.kernelParams = kernelParamsIn; } - - /** - * Getter for staticDevice - * @return String to get - */ - public String getStaticDevice() { - return this.staticDevice; - } - - /** - * Setter for staticDevice - * @param staticDeviceIn to set - */ - public void setStaticDevice(String staticDeviceIn) { - this.staticDevice = staticDeviceIn; - } -
/** * @return the cryptoKeys @@ -1230,8 +1213,6 @@ public class KickstartData { cloned.addScript(ksscloned); } } - - cloned.setStaticDevice(this.getStaticDevice()); }
// Helper method to copy KickstartCommands @@ -1499,5 +1480,27 @@ public class KickstartData { return ConfigDefaults.get().getDefaultXenVirtBridge(); } } - + + /** + * Returns the cobbler object associated to + * to this profile. + * @param user the user object needed for connection, + * enter null if you want to use the + * automated connection as provided by + * taskomatic. + * @return the Profile associated to this ks data + */ + public Profile getCobblerObject(User user) { + if (StringUtils.isBlank(getCobblerId())) { + return null; + } + CobblerConnection con; + if (user == null) { + con = CobblerXMLRPCHelper.getAutomatedConnection(); + } + else { + con = CobblerXMLRPCHelper.getConnection(user); + } + return Profile.lookupById(con, getCobblerId()); + } } diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java index 96702f7..d5c66bb 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java @@ -19,7 +19,13 @@ import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.domain.BaseDomainHelper; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.org.Org; +import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.kickstart.cobbler.CobblerCommand; +import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; + +import org.apache.commons.lang.StringUtils; +import org.cobbler.CobblerConnection; +import org.cobbler.Distro;
import java.io.File; import java.util.Date; @@ -357,4 +363,26 @@ public class KickstartableTree extends BaseDomainHelper { return kernel.exists(); }
+ /** + * Returns the cobbler object associated to + * to this tree. + * @param user the user object needed for connection, + * enter null if you want to use the + * automated connection as provided by + * taskomatic. + * @return the Distro associated to this tree + */ + public Distro getCobblerObject(User user) { + if (StringUtils.isBlank(getCobblerId())) { + return null; + } + CobblerConnection con; + if (user == null) { + con = CobblerXMLRPCHelper.getAutomatedConnection(); + } + else { + con = CobblerXMLRPCHelper.getConnection(user); + } + return Distro.lookupById(con, getCobblerId()); + } } diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java b/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java index 3ed74cb..b8f1b7f 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/builder/KickstartBuilder.java @@ -352,7 +352,6 @@ public class KickstartBuilder { if (ksdata.getPackageNames() == null) { ksdata.setPackageNames(new ArrayList<PackageName>()); } - ksdata.setStaticDevice("dhcp:eth0");
buildCommands(ksdata, parser.getOptionLines(), tree, kickstartHost); buildPackages(ksdata, parser.getPackageLines()); @@ -536,7 +535,6 @@ public class KickstartBuilder { } PackageName pn = cmd.findPackageName("@ Base"); ksdata.getPackageNames().add(pn); - ksdata.setStaticDevice("dhcp:eth0"); cmd.store(ksdata); return ksdata;
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java index bfd8a8d..e46b6ca 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java @@ -470,7 +470,6 @@ public class KickstartDataTest extends BaseTestCaseWithUser { k.addScript(KickstartScriptTest.createPreInterpreter(k)); k.addScript(KickstartScriptTest.createPostInterpreter(k));
- k.setStaticDevice(STATIC_DEV); k.setKernelParams(KERNEL_PARAMS);
k.addPackageName(pn); @@ -689,7 +688,6 @@ public class KickstartDataTest extends BaseTestCaseWithUser { assertEquals(k.getBootloaderType(), cloned.getBootloaderType()); assertEquals(k.getInstallType(), cloned.getInstallType()); assertEquals(k.getKernelParams(), cloned.getKernelParams()); - assertEquals(k.getStaticDevice(), cloned.getStaticDevice()); assertEquals(k.isActive(), cloned.isActive()); assertEquals(k.isOrgDefault(), cloned.isOrgDefault()); assertEquals(k.getOrg(), cloned.getOrg()); diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java index 1354a96..1297f69 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Server.java +++ b/java/code/src/com/redhat/rhn/domain/server/Server.java @@ -32,14 +32,18 @@ import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.configuration.ConfigurationManager; import com.redhat.rhn.manager.entitlement.EntitlementManager; +import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.apache.log4j.Logger; +import org.cobbler.CobblerConnection; +import org.cobbler.SystemRecord;
import java.sql.Timestamp; import java.util.Collection; @@ -1701,5 +1705,27 @@ public class Server extends BaseDomainHelper implements Identifiable { return null; }
+ /** + * Returns the cobbler object associated to + * to this server. + * @param user the user object needed for connection, + * enter null if you want to use the + * automated connection as provided by + * taskomatic. + * @return the SystemRecord associated to this server + */ + public SystemRecord getCobblerObject(User user) { + if (StringUtils.isBlank(getCobblerId())) { + return null; + } + CobblerConnection con; + if (user == null) { + con = CobblerXMLRPCHelper.getAutomatedConnection(); + } + else { + con = CobblerXMLRPCHelper.getConnection(user); + } + return SystemRecord.lookupById(con, getCobblerId()); + }
} 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 3f3f524..02850f9 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 @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.action.kickstart;
+import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.util.DatePicker; @@ -22,6 +23,7 @@ import com.redhat.rhn.domain.action.ActionFactory; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.rhnpackage.profile.Profile; +import com.redhat.rhn.domain.server.NetworkInterface; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper; @@ -94,6 +96,9 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { public static final String HOST_SID = "hostSid"; public static final String VIRT_HOST_IS_REGISTERED = "virtHostIsRegistered"; public static final String TARGET_PROFILE_TYPE = "targetProfileType"; + public static final String NETWORK_TYPE_DHCP = "networkTypeDhcp"; + public static final String NETWORK_INTERFACE = "networkInterface"; + public static final String NETWORK_INTERFACES = "networkInterfaces"; /** * {@inheritDoc} */ @@ -175,6 +180,39 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { } }
+ private void setupNetworkInfo(DynaActionForm form, + RequestContext context, KickstartScheduleCommand cmd) { + Server server = cmd.getServer(); + List<NetworkInterface> nics = new LinkedList<NetworkInterface> + (server.getNetworkInterfaces()); + for (Iterator<NetworkInterface> itr = nics.iterator(); itr.hasNext();) { + NetworkInterface nic = itr.next(); + if (nic.isDisabled() || "127.0.0.1".equals(nic.getIpaddr())) { + itr.remove(); + } + } + context.getRequest().setAttribute(NETWORK_INTERFACES, nics); + if (form.get(NETWORK_TYPE_DHCP) == null) { + form.set(NETWORK_TYPE_DHCP, Boolean.TRUE); + } + + if (StringUtils.isBlank(form.getString(NETWORK_INTERFACE))) { + String defaultInterface = ConfigDefaults.get(). + getDefaultKickstartNetworkInterface(); + for (NetworkInterface nic : nics) { + if (nic.getName().equals(defaultInterface)) { + form.set(NETWORK_INTERFACE, ConfigDefaults.get(). + getDefaultKickstartNetworkInterface()); + } + } + if (StringUtils.isBlank(form.getString(NETWORK_INTERFACE))) { + form.set(NETWORK_INTERFACE, server. + findPrimaryNetworkInterface().getName()); + } + + } + } + /** * The first step in the wizard * @param mapping ActionMapping for struts @@ -346,6 +384,7 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { } } } + setupNetworkInfo(form, ctx, cmd); }
@@ -380,7 +419,9 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { KickstartHelper helper = new KickstartHelper(ctx.getRequest()); KickstartScheduleCommand cmd = getScheduleCommand(form, ctx, scheduleTime, helper.getKickstartHost()); - + + cmd.setNetworkDevice(Boolean.TRUE.equals(form.get(NETWORK_TYPE_DHCP)), + form.getString(NETWORK_INTERFACE)); cmd.setKernelOptions(parseKernelOptions(form, ctx.getRequest(), form.getString(RequestContext.COBBLER_ID), false)); cmd.setPostKernelOptions(parseKernelOptions(form, ctx.getRequest(), @@ -635,5 +676,4 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { }
} - } 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 422b999..369b9e6 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 @@ -190,7 +190,6 @@ public class SystemDetailsEditAction extends RhnAction { SystemDetailsCommand command = new SystemDetailsCommand(ksdata, ctx .getLoggedInUser());
- transferNetworkEdits(form, command); transferRootPasswordEdits(form, command); if (!ksdata.isLegacyKickstart()) { command.setMode(SELinuxMode.lookup(form.getString(SE_LINUX_PARAM))); @@ -201,7 +200,6 @@ public class SystemDetailsEditAction extends RhnAction {
private void prepareForm(DynaActionForm dynaForm, KickstartData ksdata, RequestContext ctx) { - prepareNetworkConfig(dynaForm, ksdata); prepareSELinuxConfig(dynaForm, ksdata); prepareFlags(dynaForm, ksdata); dynaForm.set("submitted", Boolean.TRUE); @@ -212,25 +210,6 @@ public class SystemDetailsEditAction extends RhnAction { dynaForm.set(SE_LINUX_PARAM, ksdata.getSELinuxMode().getValue()); }
- private void prepareNetworkConfig(DynaActionForm dynaForm, - KickstartData ksdata) { - String staticDevice = ksdata.getStaticDevice(); - if (staticDevice != null) { - int breakpos = staticDevice.indexOf(":"); - String networkType = staticDevice.substring(0, breakpos); - networkType = networkType.trim().toLowerCase(); - dynaForm.set(NETWORK_TYPE_FORM_VAR, networkType); - if ((breakpos + 1) < staticDevice.length()) { - String device = staticDevice.substring(breakpos + 1); - if (networkType.equals(DHCP_NETWORK_TYPE)) { - dynaForm.set(DHCP_IF_FORM_VAR, device); - } - else { - dynaForm.set(STATIC_IF_FORM_VAR, device); - } - } - } - }
private void prepareFlags(DynaActionForm dynaForm, KickstartData ksdata) { if (ksdata.isConfigManageable()) { @@ -247,21 +226,6 @@ public class SystemDetailsEditAction extends RhnAction { } }
- private void transferNetworkEdits(DynaActionForm form, - SystemDetailsCommand command) { - String networkType = form.getString(NETWORK_TYPE_FORM_VAR); - String interfaceName = null; - if (networkType.equals(DHCP_NETWORK_TYPE)) { - interfaceName = form.getString(DHCP_IF_FORM_VAR); - form.set(STATIC_IF_FORM_VAR, ""); - } - else { - interfaceName = form.getString(STATIC_IF_FORM_VAR); - form.set(DHCP_IF_FORM_VAR, ""); - } - command.setNetworkDevice(interfaceName, networkType.equals(DHCP_NETWORK_TYPE)); - } - private void transferRootPasswordEdits(DynaActionForm form, SystemDetailsCommand command) { if (!StringUtils.isBlank(form.getString(PWD_CHANGED_PARAM))) { diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 8b3cd0c..81d8a12 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -6356,7 +6356,14 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context> </context-group> </trans-unit> - + + <trans-unit id="kickstart.schedule.nosuchdevice"> + <source>System <strong> {0} </strong> cannot be kickstarted because it does not have a <strong> {1} </strong> network device.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/ScheduleKickstart.do</context> + </context-group> + </trans-unit> + <trans-unit id="kickstart.schedule.nosubs"> <source>You have no remaining subscriptions to the @@PRODUCT_NAME@@ provisioning channel for this system's current base channel.</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 6909255..3dac7fd 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 @@ -10041,7 +10041,7 @@ Please note that some manual configuration of these scripts may still be require </trans-unit>
<trans-unit id="kickstart.netconn.jsp.label"> - <source>Kickstart <br />Network <br />Connection</source> + <source>Network Connection</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/kickstart/KickstartSystemDetailsEdit</context> </context-group> @@ -10062,7 +10062,7 @@ Please note that some manual configuration of these scripts may still be require </trans-unit>
<trans-unit id="kickstart.netconn.static.jsp.label"> - <source>Use static IP from interface</source> + <source>Use static interface</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/kickstart/KickstartSystemDetailsEdit</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java index 16dae01..7bb0153 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java @@ -241,79 +241,6 @@ public class SystemDetailsHandler extends BaseHandler { command.setMode(SELinuxMode.lookup(enforcingMode)); return setRemoteCommandsFlag(sessionKey, ksLabel, true); } - - /** - * Retrieves the network connection properties of a kickstart profile. - * @param sessionKey the session key - * @param ksLabel the ks profile label - * @return map containing the network connection properties. - * - * @xmlrpc.doc Retrieves the network connection properties of a kickstart profile. - * @xmlrpc.param #session_key() - * @xmlrpc.param #param_desc("string", "ksLabel","the kickstart profile label") - * @xmlrpc.returntype - * #struct("network connection info") - * #prop("int", "is_dhcp") - * #options() - * #item_desc ("1", "the type of network connection is dhcp") - * #item_desc ("0", "the type of network connection is static") - * #options_end() - * #prop_desc("string", "interface_name", "name of the network interface- - * eg: eth0") - * #struct_end() - */ - public Map getNetworkConnection(String sessionKey, String ksLabel) { - User user = getLoggedInUser(sessionKey); - ensureConfigAdmin(user); - SystemDetailsCommand command = getSystemDetailsCommand(ksLabel, user); - - Map<String, Object> map = new HashMap<String, Object>(); - map.put("interface_name", command.getNetworkInterface()); - if (command.getNetworkType().equals(SystemDetailsCommand.DHCP_NETWORK_TYPE)) { - map.put("is_dhcp", new Integer(1)); - } - else if (command.getNetworkType().equals( - SystemDetailsCommand.STATIC_NETWORK_TYPE)) { - map.put("is_dhcp", new Integer(0)); - } - return map; - } - - /** - * Sets the network device property of a kickstart profile - * so that a system created using this profile will be have - * the appropriate network device associated to it. - * @param sessionKey the session key - * @param ksLabel the ks profile label - * @param isDhcp true if the network device uses DHCP - * @param interfaceName network interface name - * @return 1 on success - * - * @xmlrpc.doc Sets the network device property of a kickstart profile - * so that a system created using this profile will be have - * the appropriate network device associated to it. - * @xmlrpc.param #session_key() - * @xmlrpc.param #param_desc("string", "ksLabel","the kickstart profile label") - * @xmlrpc.param #param("int", "isDhcp") - * #options() - * #item_desc ("1", - * "to set the network type of the connection type to dhcp") - * #item_desc ("0", - * "to set the network type of the connection type to static device") - * #options_end() - * @xmlrpc.param #param_desc("string", "interfaceName", - * "name of the network interface- eg:- eth0") - * @xmlrpc.returntype #return_int_success() - */ - public int setNetworkConnection(String sessionKey, String ksLabel, - boolean isDhcp, String interfaceName) { - User user = getLoggedInUser(sessionKey); - ensureConfigAdmin(user); - SystemDetailsCommand command = getSystemDetailsCommand(ksLabel, user); - - command.setNetworkDevice(interfaceName, isDhcp); - return setRemoteCommandsFlag(sessionKey, ksLabel, true); - }
/** * Retrieves the locale for a kickstart profile. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/test/SystemDetailsHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/test/SystemDetailsHandlerTest.java index 046fdea..0a54415 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/test/SystemDetailsHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/test/SystemDetailsHandlerTest.java @@ -36,7 +36,6 @@ import com.redhat.rhn.manager.kickstart.KickstartEditCommand; import com.redhat.rhn.testing.UserTestUtils;
import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -125,29 +124,6 @@ public class SystemDetailsHandlerTest extends BaseHandlerTestCase { assertFalse(remoteCommands); }
- public void testNetworkConnection() throws Exception { - KickstartData profile = createProfile(); - String interfaceName = "eth0"; - handler.setNetworkConnection(adminKey, profile.getLabel(), true, interfaceName); - - Map<String, Object> connection = new HashMap<String, Object>(); - connection = handler.getNetworkConnection(adminKey, profile.getLabel()); - - assertTrue(connection.containsKey("interface_name")); - assertTrue(connection.containsKey("is_dhcp")); - assertEquals(interfaceName, connection.get("interface_name")); - // connection type is dhcp - assertEquals(new Integer(1), connection.get("is_dhcp")); - - handler.setNetworkConnection(adminKey, profile.getLabel(), false, interfaceName); - connection = handler.getNetworkConnection(adminKey, profile.getLabel()); - - assertTrue(connection.containsKey("interface_name")); - assertTrue(connection.containsKey("is_dhcp")); - assertEquals(interfaceName, connection.get("interface_name")); - // connection type is static - assertEquals(new Integer(0), connection.get("is_dhcp")); - }
public void testGetLocale() throws Exception {
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java index c8922c4..23f8353 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java @@ -63,7 +63,6 @@ public class KickstartDataSerializer implements XmlRpcCustomSerializer { helper.add("kernelParams", kd.getKernelParams()); helper.add("nonChrootPost", kd.getNonChrootPost()); helper.add("verboseUp2date", kd.getVerboseUp2date()); - helper.add("staticDevice", kd.getStaticDevice()); helper.add("packageNames", kd.getPackageNames()); helper.add("commands", kd.getCommands()); helper.add("defaultRegTokens", kd.getDefaultRegTokens()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index df6153e..cc08b0a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -16,6 +16,8 @@ package com.redhat.rhn.frontend.xmlrpc.system;
import com.redhat.rhn.FaultException; import com.redhat.rhn.common.client.ClientCertificate; +import com.redhat.rhn.common.client.ClientCertificateDigester; +import com.redhat.rhn.common.client.InvalidCertificateException; import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; @@ -79,6 +81,7 @@ import com.redhat.rhn.frontend.xmlrpc.InvalidErrataException; import com.redhat.rhn.frontend.xmlrpc.InvalidPackageException; import com.redhat.rhn.frontend.xmlrpc.InvalidProfileLabelException; import com.redhat.rhn.frontend.xmlrpc.InvalidSystemException; +import com.redhat.rhn.frontend.xmlrpc.MethodInvalidParamException; import com.redhat.rhn.frontend.xmlrpc.NoSuchActionException; import com.redhat.rhn.frontend.xmlrpc.NoSuchChannelException; import com.redhat.rhn.frontend.xmlrpc.NoSuchPackageException; @@ -100,6 +103,7 @@ import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.errata.ErrataManager; +import com.redhat.rhn.manager.kickstart.KickstartFormatter; import com.redhat.rhn.manager.kickstart.KickstartScheduleCommand; import com.redhat.rhn.manager.kickstart.ProvisionVirtualInstanceCommand; import com.redhat.rhn.manager.profile.ProfileManager; @@ -114,7 +118,11 @@ import com.redhat.rhn.manager.user.UserManager;
import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import org.cobbler.SystemRecord; +import org.xml.sax.SAXException;
+import java.io.IOException; +import java.io.StringReader; import java.net.URI; import java.net.URISyntaxException; import java.sql.Blob; @@ -3997,4 +4005,67 @@ public class SystemHandler extends BaseHandler { } return channel; } + + /** + * Method to setup the static network configuration for a given server + * This is used by spacewalkkoan if the user selects static networking option + * in the advanced configuration section during provisioning. + * It basically adds $static_network variable to the cobbler system record + * which gets rendered during the kickstart. + * @param clientcert the client certificate or the system id file + * @param data a map holding the network details like ip, gateway, + * name servers, ip, netmask and hostname. + * + * @return 1 on success exception otherwise. + * + * @xmlrpc.ignore Since this API is for internal integration between services and + * is not useful to external users of the API, the typical XMLRPC API documentation + * is not being included. + */ + public int setupStaticNetwork(String clientcert, Map<String, Object> data) { + StringReader rdr = new StringReader(clientcert); + Server server = null; + + ClientCertificate cert; + try { + cert = ClientCertificateDigester.buildCertificate(rdr); + server = SystemManager.lookupByCert(cert); + if (server == null) { + throw new NoSuchSystemException(); + } + } + catch (IOException ioe) { + log.error("IOException - Trying to access a system with an " + + "invalid certificate", ioe); + throw new MethodInvalidParamException(); + } + catch (SAXException se) { + log.error("SAXException - Trying to access a " + + "system with an invalid certificate", se); + throw new MethodInvalidParamException(); + } + catch (InvalidCertificateException e) { + log.error("InvalidCertificateException - Trying to access a " + + "system with an invalid certificate", e); + throw new MethodInvalidParamException(); + } + SystemRecord rec = server.getCobblerObject(null); + if (rec == null) { + throw new NoSuchSystemException(); + } + + String device = (String)data.get("device"); + String gateway = (String)data.get("gateway"); + List<String> nameservers = (List<String>)data.get("nameservers"); + String ip = (String)data.get("ip"); + String netmask = (String)data.get("netmask"); + String hostName = (String)data.get("hostname"); + String command = KickstartFormatter.makeStaticNetworkCommand(device, ip, gateway, + nameservers.get(0), netmask, hostName); + Map<String, String> meta = rec.getKsMeta(); + meta.put(KickstartFormatter.STATIC_NETWORK_VAR, command); + rec.setKsMeta(meta); + rec.save(); + return 1; + } } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java index 051307d..af1f624 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java @@ -150,7 +150,20 @@ public class KickstartFormatter { private static final String CHDIR_OPT_RPMS = "cd /tmp/rhn_rpms/optional "; private static final String CHDIR_RPMS = "cd /tmp/rhn_rpms"; private static final String REDHAT_MGMT_SERVER = "$redhat_management_server"; - + public static final String STATIC_NETWORK_VAR = "static_network"; + private static final String STATIC_NETWORK_COMMAND = "network --bootproto static" + + " " + "--device %s --ip %s" + + " " + "--gateway %s" + + " " + "--nameserver %s" + + " " + "--netmask %s" + + " " + "--hostname %s"; + private static final String NETWORK_STRING = + "#if $varExists('%s')" + NEWLINE + + "$%s" + NEWLINE + + "#else" + NEWLINE + + "%s" + NEWLINE + + "#end if" + NEWLINE; + private boolean seenNoChroot = false; private KickstartData ksdata; private String ksHost; @@ -255,8 +268,8 @@ public class KickstartFormatter { * * @return string containing kickstart commands */ - private StringBuffer getCommands() { - StringBuffer commands = new StringBuffer(); + private String getCommands() { + StringBuilder commands = new StringBuilder(); LinkedList l = new LinkedList(this.ksdata.getCommands()); Collections.sort(l); for (Iterator itr = l.iterator(); itr.hasNext();) { @@ -282,6 +295,11 @@ public class KickstartFormatter { else if ("custom".equals(cname)) { commands.append(command.getArguments() + NEWLINE); } + else if ("network".equals(cname)) { + commands.append(String.format(NETWORK_STRING, STATIC_NETWORK_VAR, + STATIC_NETWORK_VAR, + cname + SPACE + command.getArguments())); + } else { String argVal = command.getArguments(); // some commands don't require an arg and are null in db @@ -294,9 +312,29 @@ public class KickstartFormatter { } }
- return commands; + return commands.toString(); } - + + /** + * Returns the network line for static networks + * network --bootproto static --device $DEVICE --ip $IPADDR + * --gateway $GATEWAY --nameserver $NAMESERVER + * --netmask $NETMASK --hostname $HOSTNAME + * @param device the network interface name (eth0) + * @param ip the ip address of the interface + * @param gateway the gateway information of the card + * @param nameServer the nameserver information + * @param netmask the netmask information + * @param hostName the host name information + * @return the network* lne for a static host + */ + public static String makeStaticNetworkCommand(String device, + String ip, String gateway, + String nameServer, String netmask, String hostName) { + return String.format(STATIC_NETWORK_COMMAND, device, ip, + gateway, nameServer, netmask, hostName); + } + /** * Adjust the URL hostname if necessary. Hostnames are stored in the db as relative * paths if the user selects to use the default URL. When rendered we need to swap 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 c065812..687edba 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.manager.kickstart;
+import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; @@ -36,6 +37,7 @@ import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PackageFactory; import com.redhat.rhn.domain.rhnpackage.profile.Profile; import com.redhat.rhn.domain.rhnpackage.profile.ProfileFactory; +import com.redhat.rhn.domain.server.NetworkInterface; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerConstants; import com.redhat.rhn.domain.server.ServerFactory; @@ -107,21 +109,17 @@ import java.util.Set; public class KickstartScheduleCommand extends BaseSystemOperation {
private static Logger log = Logger.getLogger(KickstartScheduleCommand.class); - + public static final String DHCP_NETWORK_TYPE = "dhcp"; + public static final String STATIC_NETWORK_TYPE = "static"; // up2date is required to be 2.9.0 public static final String UP2DATE_VERSION = "2.9.0"; - - public static final String ACTIVATION_TYPE_KEY = "activationKey"; - public static final String ACTIVATION_TYPE_EXISTING = "existingProfile"; - public static final String TARGET_PROFILE_TYPE_EXISTING = "existing"; public static final String TARGET_PROFILE_TYPE_PACKAGE = "package"; public static final String TARGET_PROFILE_TYPE_SYSTEM = "system"; public static final String TARGET_PROFILE_TYPE_NONE = "none";
public static final String PACKAGE_TO_REMOVE = "rhn-kickstart-virtualization"; - - + private User user; private KickstartData ksdata; protected String cobblerProfileLabel; @@ -141,7 +139,8 @@ public class KickstartScheduleCommand extends BaseSystemOperation { // Profile created from this KS private Profile createdProfile; // Static device - private String staticDevice; + private String networkInterface; + private boolean isDhcp;
private String kernelOptions; private String postKernelOptions; @@ -353,7 +352,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation { }
this.setUser(userIn); - this.setStaticDevice(""); + networkInterface = ""; }
@@ -763,7 +762,9 @@ public class KickstartScheduleCommand extends BaseSystemOperation { if (prereqAction != null) { ksAction.setPrerequisite(prereqAction); } - ksAction.getKickstartActionDetails().setStaticDevice(this.getStaticDevice()); + if (!isDhcp) { + ksAction.getKickstartActionDetails().setStaticDevice(networkInterface); + } return ksAction; }
@@ -797,6 +798,10 @@ public class KickstartScheduleCommand extends BaseSystemOperation { * @return Returns a ValidatorError, if any errors occur */ public ValidatorError doValidation() { + ValidatorError error = validateNetworkInterface(); + if (error != null) { + return error; + } if (isCobblerOnly()) { return null; } @@ -811,7 +816,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
// Check that we have a valid ks package log.debug("** Checking validkspackage"); - ValidatorError error = validateKickstartPackage(); + error = validateKickstartPackage(); if (error != null) { return error; } @@ -925,7 +930,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation { */ public String getExtraOptions() { if (isCobblerOnly()) { - return ""; + return StringUtils.defaultString(kernelOptions); } StringBuilder retval = new StringBuilder(); String kOptions = StringUtils.defaultString(kernelOptions); @@ -933,29 +938,19 @@ public class KickstartScheduleCommand extends BaseSystemOperation { dhcp:eth0 , dhcp:eth2, static:10.1.4.75 static:146.108.30.184, static:auto, static:eth0 */ - if (this.getKsdata().getStaticDevice() != null) { - staticDevice = this.getKsdata().getStaticDevice(); - if (staticDevice.indexOf("dhcp:") >= 0) { + if (!StringUtils.isBlank(networkInterface)) { + if (isDhcp) { // Get rid of the dhcp: - String params = " ksdevice=" + staticDevice.substring( - staticDevice.indexOf("dhcp:") + "dhcp:".length()); + String params = " ksdevice=" + networkInterface; if (!kOptions.contains("ksdevice")) { retval.append(params); } - staticDevice = ""; - } - else if (staticDevice.indexOf("static:") >= 0) { - // Get rid of the static: - staticDevice = staticDevice.substring( - staticDevice.indexOf("static:") + "static:".length()); - - } - else { - if (!kOptions.contains("ksdevice")) { - retval.append("ksdevice=eth0"); - } } } + else if (!kOptions.contains("ksdevice")) { + retval.append("ksdevice=" + + ConfigDefaults.get().getDefaultKickstartNetworkInterface()); + } retval.append(" ").append(kOptions); return retval.toString(); } @@ -1387,20 +1382,14 @@ public class KickstartScheduleCommand extends BaseSystemOperation { public void setKickstartServerName(String kickstartServerNameIn) { this.kickstartServerName = kickstartServerNameIn; } - - /** - * @return Returns the staticDevice. - */ - public String getStaticDevice() { - return staticDevice; - } -
/** - * @param staticDeviceIn The staticDevice to set. + * @param dhcp true if this is a dc + * @param networkInterfaceIn The staticDevice to set. */ - public void setStaticDevice(String staticDeviceIn) { - this.staticDevice = staticDeviceIn; + public void setNetworkDevice(boolean dhcp, String networkInterfaceIn) { + isDhcp = dhcp; + networkInterface = networkInterfaceIn; }
/** @@ -1465,4 +1454,21 @@ public class KickstartScheduleCommand extends BaseSystemOperation { public void setPostKernelOptions(String postKernelOptionsIn) { this.postKernelOptions = postKernelOptionsIn; } + + private ValidatorError validateNetworkInterface() { + boolean nicAvailable = false; + if (!StringUtils.isEmpty(networkInterface)) { + for (NetworkInterface nic : server.getNetworkInterfaces()) { + if (networkInterface.equals(nic.getName())) { + nicAvailable = true; + break; + } + } + } + if (!nicAvailable) { + return new ValidatorError("kickstart.schedule.nosuchdevice", + server.getName(), networkInterface); + } + return null; + } } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java index 103013e..0737a65 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java @@ -68,7 +68,6 @@ public class ProvisionVirtualInstanceCommand extends KickstartScheduleCommand { public ProvisionVirtualInstanceCommand(Long selectedServer, User userIn) { super(selectedServer, null, (KickstartData)null, userIn, null, null); this.setPackagesToInstall(new LinkedList()); - this.setStaticDevice(""); }
/** diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java index 401ddd6..d14e1d0 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java @@ -53,7 +53,8 @@ public class SSMScheduleCommand { private Long serverProfileId;
private Server proxy; - + private boolean isDhcp = true; + private String networkInterface; private List<Action> scheduledActions = new ArrayList<Action>(); private String kernelParamType; private String customKernelParams; @@ -207,6 +208,7 @@ public class SSMScheduleCommand { com.setProfileId(packageProfileId); com.setServerProfileId(serverProfileId); com.setProxy(proxy); + com.setNetworkDevice(isDhcp, networkInterface); if (proxy == null) { com.setKickstartServerName(ConfigDefaults.get().getCobblerHost()); } @@ -260,4 +262,14 @@ public class SSMScheduleCommand { public void setCustomPostKernelParams(String customPostKernelParamsIn) { this.customPostKernelParams = customPostKernelParamsIn; } + + /** + * @param dhcp true if this is a dc + * @param networkInterfaceIn The staticDevice to set. + */ + public void setNetworkDevice(boolean dhcp, String networkInterfaceIn) { + isDhcp = dhcp; + networkInterface = networkInterfaceIn; + } + } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/SystemDetailsCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/SystemDetailsCommand.java index 2dfe239..29fbf8a 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/SystemDetailsCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/SystemDetailsCommand.java @@ -24,8 +24,6 @@ import com.redhat.rhn.domain.kickstart.KickstartDefaults; import com.redhat.rhn.domain.kickstart.SELinuxMode; import com.redhat.rhn.domain.user.User;
-import org.apache.commons.lang.StringUtils; - import java.util.Date;
/** @@ -34,10 +32,6 @@ import java.util.Date; * @version $Rev $ */ public class SystemDetailsCommand extends BaseKickstartCommand { - - public static final String DHCP_NETWORK_TYPE = "dhcp"; - public static final String STATIC_NETWORK_TYPE = "static"; - /** * constructor * @param ksidIn kickstart id @@ -72,57 +66,6 @@ public class SystemDetailsCommand extends BaseKickstartCommand { }
/** - * Sets the static device information of a ks profile. - * @param interfaceName the network interface name - * @param isDhcp true of its a dhcp network type - */ - public void setNetworkDevice(String interfaceName, boolean isDhcp) { - if (StringUtils.isBlank(interfaceName)) { - ValidatorException.raiseException( - "kickstart.systemdetails.missing.netdevice.jsp.error"); - } - if (isDhcp) { - ksdata.setStaticDevice(DHCP_NETWORK_TYPE + ":" + interfaceName); - } - else { - ksdata.setStaticDevice(STATIC_NETWORK_TYPE + ":" + interfaceName); - } - } - - /** - * Retrieve the network interface (e.g. eth0) based on the value stored in the - * kickstart data staticDevice (e.g. dhcp:eth0). - * @return the network interface - */ - public String getNetworkInterface() { - String device = new String(); - String staticDevice = ksdata.getStaticDevice(); - if (staticDevice != null) { - int breakpos = staticDevice.indexOf(":"); - if ((breakpos + 1) < staticDevice.length()) { - device = staticDevice.substring(breakpos + 1); - } - } - return device; - } - - /** - * Retrieve the network type (dhcp or static) based on the value stored in the - * kickstart data staticDevice (e.g. dhcp:eth0). - * @return the network type (dhcp or static) - */ - public String getNetworkType() { - String networkType = new String(); - String staticDevice = ksdata.getStaticDevice(); - if (staticDevice != null) { - int breakpos = staticDevice.indexOf(":"); - networkType = staticDevice.substring(0, breakpos); - networkType = networkType.trim().toLowerCase(); - } - return networkType; - } - - /** * Updates the root password in the network profile. * @param rootPw the new password * @param rootPwConfirm password confirmation .. diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java index e6e3869..721161d 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java @@ -55,7 +55,7 @@ public class CobblerSystemCreateCommand extends CobblerCommand { private String kickstartHost; private String kernelOptions; private String postKernelOptions; - + /** * Constructor * @param userIn who is requesting the sync @@ -281,6 +281,7 @@ public class CobblerSystemCreateCommand extends CobblerCommand { server.getCobblerId()); record.setKernelOptions(kernelOptions); record.setKernelPostOptions(postKernelOptions); + record.save(); return null; } @@ -309,7 +310,13 @@ public class CobblerSystemCreateCommand extends CobblerCommand { Map inet = new HashMap(); for (NetworkInterface n : serverIn.getNetworkInterfaces()) { if (!n.getHwaddr().equals("00:00:00:00:00:00")) { - inet.put("macaddress-" + n.getName(), n.getHwaddr()); + inet.put("macaddress-" + n.getName(), n.getHwaddr()); + if (!StringUtils.isBlank(n.getIpaddr())) { + inet.put("ipaddress-" + n.getName(), n.getIpaddr()); + } + if (!StringUtils.isBlank(n.getNetmask())) { + inet.put("subnet-" + n.getName(), n.getNetmask()); + } } } log.debug("Networks: " + inet); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java index 9b9ee37..b9b732e 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java @@ -40,7 +40,6 @@ import com.redhat.rhn.domain.server.ServerGroupType; import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.domain.token.ActivationKey; import com.redhat.rhn.domain.token.ActivationKeyFactory; -import com.redhat.rhn.domain.token.test.ActivationKeyTest; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.kickstart.KickstartChannelDto; import com.redhat.rhn.manager.action.ActionManager; @@ -51,7 +50,6 @@ import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.testing.TestUtils;
import java.util.Date; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -66,7 +64,6 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase { private Long otherServerId; private Long profileId; private String profileType; - private Set activationKeyIds;
/** * {@inheritDoc} @@ -81,7 +78,6 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase { server.addChannel(c);
KickstartDataTest.addKickstartPackagesToChannel(c, false); - ksdata.setStaticDevice("static:10.1.4.75"); ksdata.setKernelParams("someparam=asdf"); ksdata.getTree().setChannel(server.getBaseChannel()); KickstartSession ksession = KickstartSessionTest. @@ -102,17 +98,13 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase { }
public void testCommandActKey() throws Exception { - ActivationKey key = ActivationKeyTest.createTestActivationKey(user, server); - activationKeyIds = new HashSet(); - activationKeyIds.add(key.getId()); Server otherServer = ServerFactoryTest.createTestServer(user, true, ServerConstants.getServerGroupTypeEnterpriseEntitled()); otherServer.addChannel(ChannelFactoryTest.createTestChannel(user)); otherServerId = otherServer.getId(); profileType = KickstartScheduleCommand.TARGET_PROFILE_TYPE_SYSTEM; KickstartScheduleCommand cmd = testCommandExecution( - KickstartScheduleCommand.ACTIVATION_TYPE_KEY, server, - ksdata, profileType, activationKeyIds, otherServerId, profileId); + server, ksdata, profileType, otherServerId, profileId); assertNotNull(cmd.getCreatedProfile()); }
@@ -159,22 +151,18 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase { public void testCommandExisting() throws Exception { profileType = KickstartScheduleCommand.TARGET_PROFILE_TYPE_EXISTING; KickstartScheduleCommand cmd = testCommandExecution( - KickstartScheduleCommand.ACTIVATION_TYPE_EXISTING, - server, ksdata, profileType, - activationKeyIds, otherServerId, profileId); + server, ksdata, profileType, + otherServerId, profileId); assertNotNull(cmd.getCreatedProfile()); }
public void testCommandNoProfileSynch() throws Exception { - testCommandExecution(KickstartScheduleCommand.ACTIVATION_TYPE_EXISTING, - server, ksdata, profileType, - activationKeyIds, otherServerId, profileId); + testCommandExecution(server, ksdata, profileType, otherServerId, profileId); }
public void testCommandProxyKs() throws Exception { - KickstartScheduleCommand cmd = testCommandExecution( - KickstartScheduleCommand.ACTIVATION_TYPE_EXISTING, server, - ksdata, profileType, activationKeyIds, otherServerId, profileId); + KickstartScheduleCommand cmd = testCommandExecution(server, + ksdata, profileType, otherServerId, profileId); Server proxy = ServerFactoryTest.createTestServer(user, true, ServerConstants.getServerGroupTypeEnterpriseEntitled()); cmd.setProxy(proxy); @@ -182,9 +170,8 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase { }
public void testGetProxies() throws Exception { - KickstartScheduleCommand cmd = testCommandExecution( - KickstartScheduleCommand.ACTIVATION_TYPE_EXISTING, server, - ksdata, profileType, activationKeyIds, otherServerId, profileId); + KickstartScheduleCommand cmd = testCommandExecution(server, + ksdata, profileType, otherServerId, profileId); assertNull(cmd.store()); assertNotNull(SystemManager.listProxies(user.getOrg())); assertEquals(0, SystemManager.listProxies(user.getOrg()).size()); @@ -195,9 +182,8 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase { String desc = "test profile " + TestUtils.randomString(); profileId = ProfileManager.createProfile(ProfileFactory.TYPE_SYNC_PROFILE, user, ChannelFactoryTest.createTestChannel(user), desc , desc).getId(); - KickstartScheduleCommand cmd = testCommandExecution( - KickstartScheduleCommand.ACTIVATION_TYPE_EXISTING, server, - ksdata, profileType, activationKeyIds, otherServerId, profileId); + KickstartScheduleCommand cmd = testCommandExecution(server, + ksdata, profileType, otherServerId, profileId); assertNotNull(cmd.getCreatedProfile()); assertNotNull(cmd.getKickstartSession().getServerProfile()); assertEquals(profileId, cmd.getKickstartSession().getServerProfile().getId()); @@ -262,9 +248,7 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
profileType = KickstartScheduleCommand.TARGET_PROFILE_TYPE_EXISTING; KickstartScheduleCommand cmd = testCommandExecution( - KickstartScheduleCommand.ACTIVATION_TYPE_EXISTING, - server, ksdata, profileType, - activationKeyIds, otherServerId, profileId); + server, ksdata, profileType, otherServerId, profileId); ActivationKey key = ActivationKeyFactory. lookupByKickstartSession(cmd.getKickstartSession()); assertEquals(1, 1); @@ -298,9 +282,7 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase { profileType = KickstartScheduleCommand.TARGET_PROFILE_TYPE_EXISTING;
KickstartScheduleCommand cmd = testCommandExecution( - KickstartScheduleCommand.ACTIVATION_TYPE_EXISTING, - server, ksdata, profileType, - activationKeyIds, otherServerId, profileId); + server, ksdata, profileType, otherServerId, profileId); ActivationKey key = ActivationKeyFactory. lookupByKickstartSession(cmd.getKickstartSession()); assertTrue(key.getChannels().size() == 2); @@ -329,8 +311,7 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase { public static KickstartScheduleCommand scheduleAKickstart(Server server, KickstartData ksdata) throws Exception { ksdata.getTree().setChannel(server.getBaseChannel()); - return testCommandExecution(KickstartScheduleCommand.ACTIVATION_TYPE_EXISTING, - server, ksdata, null, null, null, null); + return testCommandExecution(server, ksdata, null, null, null); }
public static void setupChannelForKickstarting(Channel c, User user) throws Exception { @@ -349,9 +330,9 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
// Like the number of params on this one? Nice eh? At least its private and // in test code :-) - private static KickstartScheduleCommand testCommandExecution(String activationType, + private static KickstartScheduleCommand testCommandExecution( Server server, KickstartData ksdata, String profileType, - Set activationKeyIds, Long otherServerId, Long profileId) + Long otherServerId, Long profileId) throws Exception { User user = server.getCreator(); user.addRole(RoleFactory.ORG_ADMIN); diff --git a/java/code/src/org/cobbler/CobblerObject.java b/java/code/src/org/cobbler/CobblerObject.java index 172fc18..588bafb 100644 --- a/java/code/src/org/cobbler/CobblerObject.java +++ b/java/code/src/org/cobbler/CobblerObject.java @@ -387,8 +387,8 @@ public abstract class CobblerObject { /** * @return the kernelMeta */ - public Map<String, Object> getKsMeta() { - return (Map<String, Object>)dataMap.get(KS_META); + public Map<String, String> getKsMeta() { + return (Map<String, String>)dataMap.get(KS_META); }
diff --git a/java/code/src/org/cobbler/Profile.java b/java/code/src/org/cobbler/Profile.java index 232bb93..9e1a4b9 100644 --- a/java/code/src/org/cobbler/Profile.java +++ b/java/code/src/org/cobbler/Profile.java @@ -342,13 +342,6 @@ public class Profile extends CobblerObject { }
/** - * @param nameServersIn the NameServers - */ - public void setNameServers(String nameServersIn) { - modify(NAME_SERVERS, nameServersIn); - } - - /** * @param enableMenuIn the EnableMenu */ public void setEnableMenu(boolean enableMenuIn) { diff --git a/java/code/src/org/cobbler/SystemRecord.java b/java/code/src/org/cobbler/SystemRecord.java index d5c4f13..32bcd50 100644 --- a/java/code/src/org/cobbler/SystemRecord.java +++ b/java/code/src/org/cobbler/SystemRecord.java @@ -27,7 +27,8 @@ import java.util.Set; */
public class SystemRecord extends CobblerObject { - + private static final String NAME_SERVERS = "name_servers"; + private static final String GATEWAY = "gateway"; private static final String PROFILE = "profile"; private static final String VIRT_BRIDGE = "virt_bridge"; private static final String VIRT_CPUS = "virt_cpus"; @@ -36,9 +37,8 @@ public class SystemRecord extends CobblerObject { private static final String VIRT_FILE_SIZE = "virt_file_size"; private static final String VIRT_RAM = "virt_ram"; private static final String NETBOOT_ENABLED = "netboot_enabled"; - public static final String REDHAT_MGMT_SERVER = "redhat_management_server"; - + private SystemRecord(CobblerConnection clientIn) { client = clientIn; } @@ -302,4 +302,18 @@ public class SystemRecord extends CobblerObject { public void enableNetboot(boolean enable) { modify(NETBOOT_ENABLED, enable); } + + /** + * @param nameServersIn the NameServers + */ + public void setNameServers(String nameServersIn) { + modify(NAME_SERVERS, nameServersIn); + } + + /** + * @param gateway the Gateway + */ + public void setGateway(String gateway) { + modify(GATEWAY, gateway); + } } diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf index 7b84574..8bbc685 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf @@ -40,6 +40,9 @@ function setStep(stepName) { <html:hidden property="guestName" /> <html:hidden property="proxyHost" /> <table class="details"> + <c:if test="${not empty regularKS}"> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf" %> + </c:if> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf" %> <c:if test="${empty requestScope.cobblerOnlyProfile}" > <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf index 86e84fa..544f130 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf @@ -10,6 +10,9 @@ <input type="hidden" name="postKernelParams" value="${form.postKernelParams}" /> <input type="hidden" name="kernelParamsType" value="${form.kernelParamsType}" /> <input type="hidden" name="kernelParams" value="${form.kernelParams}" /> + + <input type="hidden" name="networkTypeDhcp" value="${form.networkTypeDhcp}" /> + <input type="hidden" name="networkInterface" value="${form.networkInterface}" />
<!-- Store useful id fields--> <input type="hidden" name="wizardStep" value="first" id="wizard-step" /> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf new file mode 100644 index 0000000..db56262 --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf @@ -0,0 +1,56 @@ +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> + <tr> + <th><bean:message key="kickstart.netconn.jsp.label" />:</th> + <td> + <input type="radio" name="networkTypeDhcp" value="true" + onclick="form.dhcpNetworkId.disabled = false; form.staticNetworkId.disabled = true;" + <c:if test="${form.networkTypeDhcp or empty form.networkTypeDhcp}">checked="checked"</c:if> + /> + <bean:message key="kickstart.netconn.dhcp.jsp.label"/> + <c:choose> + <c:when test="${empty requestScope.networkInterfaces}"> + <input type="text" name="networkInterface" id="dhcpNetworkId" size="4" maxlength="10" + <c:if test="${not form.networkTypeDhcp}">disabled="true"</c:if> + value="${form.networkInterface}"/> + </c:when> + <c:otherwise> + <select name="networkInterface" id="dhcpNetworkId" + <c:if test="${not form.networkTypeDhcp}">disabled="true"</c:if> + > + <c:forEach var="nic" items="${requestScope.networkInterfaces}"> + <option + <c:if test="${nic.name == form.networkInterface}">selected="selected"</c:if> + value='${nic.name}'>${nic.name}</option> + </c:forEach> + </select> + </c:otherwise> + </c:choose> + <br /> + <input type="radio" name="networkTypeDhcp" value="false" + onclick="form.staticNetworkId.disabled = false;form.dhcpNetworkId.disabled = true;" + <c:if test="${not form.networkTypeDhcp}">checked="checked"</c:if> + /> + <bean:message key="kickstart.netconn.static.jsp.label"/> + <c:choose> + <c:when test="${empty requestScope.networkInterfaces}"> + <input type="text" name="networkInterface" id="staticNetworkId" size="4" maxlength="10" + <c:if test="${form.networkTypeDhcp}">disabled="true"</c:if> + value="${form.networkInterface}"/> + </c:when> + <c:otherwise> + <select name="networkInterface" id="staticNetworkId" + <c:if test="${form.networkTypeDhcp}">disabled="true"</c:if> + > + <c:forEach var="nic" items="${requestScope.networkInterfaces}"> + <option + <c:if test="${nic.name == form.networkInterface}">selected="selected"</c:if> + value='${nic.name}'>${nic.name}</option> + </c:forEach> + </select> + </c:otherwise> + </c:choose> + </td> + </tr> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp index 7f87c6b..2366475 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp @@ -50,10 +50,12 @@ <c:if test="${empty requestScope.isIP}"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf" %> </c:if> - <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf" %> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf" %> <br/> + <h2><img src="/img/icon_kickstart_session-medium.gif" /><bean:message key="kickstart.schedule.heading4.jsp" /></h2> <table class="details"> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/network-options.jspf" %> <tr> <th width="10%"><bean:message key="kickstartdetails.jsp.kernel_options" />:</th> <td> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp index 19d732b..d9e34f1 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/systemdetails.jsp @@ -63,15 +63,6 @@ boolean staticIfDisabled = Boolean.valueOf( <html:hidden property="submitted" /> <html:hidden property="pwdChanged" styleId="pwdChanged" /> <h2><bean:message key="kickstart.systemdetails.jsp.header1"/></h2> - <table class="details" width="80%"> - <tr> - <th width="10%"><bean:message key="kickstart.netconn.jsp.label" />:</th> - <td> - <html:radio styleId="dhcpRadio" property="networkType" value="dhcp" onclick="toggleIFText(this);" /><bean:message key="kickstart.netconn.dhcp.jsp.label"/> <html:text size="4" maxlength="10" property="dhcpNetworkIf" styleId="dhcpNetworkIf" disabled="<%= dhcpIfDisabled%>" /><br /> - <html:radio styleId="staticRadio" property="networkType" value="static" onclick="toggleIFText(this);" /><bean:message key="kickstart.netconn.static.jsp.label"/> <html:text size="4" maxlength="10" property="staticNetworkIf" styleId="staticNetworkIf" disabled="<%= staticIfDisabled%>" /> - </td> - </tr> - </table> <c:if test="${not ksdata.legacyKickstart}"> <h2><bean:message key="kickstart.systemdetails.jsp.header2"/></h2> <table class="details"> diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 0ae2e38..d0a2ab0 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -730,6 +730,9 @@ <form-property name="scheduleDate" type="java.util.Date" /> <form-property name="nextAction" type="java.lang.String" /> <form-property name="proxyHost" type="java.lang.String" /> + <!-- Advanced Options Page --> + <form-property name="networkTypeDhcp" type="java.lang.Boolean" /> + <form-property name="networkInterface" type="java.lang.String" /> <form-property name="kernelParamsType" type="java.lang.String" /> <form-property name="kernelParams" type="java.lang.String" /> <form-property name="postKernelParamsType" type="java.lang.String" />
commit a954b19bc2e5f93cdc1e64a1721e6d0f5beecf0a Author: Pradeep Kilambi pkilambi@redhat.com Date: Fri Jul 10 18:19:43 2009 -0400
Automatic commit of package [spacewalk-backend] release [0.6.18-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 6422b38..91eaab6 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 0.6.17 +Version: 0.6.18 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -568,6 +568,14 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$ %changelog +* Fri Jul 10 2009 Pradeep Kilambi pkilambi@redhat.com 0.6.18-1 +- If not commandline options given, compare the erratum channels to the already + imported ones (pkilambi@redhat.com) +- If not commandline options given, compare the erratum channels to the already + imported ones (pkilambi@redhat.com) +- compute the channel filtering only if a channel is specified in the + commandline. If not, use the default (pkilambi@redhat.com) + * Thu Jul 09 2009 John Matthews jmatthew@redhat.com 0.6.17-1 - Only include the channels that are being synced to each errata. This will help taskomatic not spam users with irrelevant errata mails diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 574ba2e..623b7fc 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.17-1 backend/ +0.6.18-1 backend/
commit 3553db49d43fe65595dec20c69d1fd5e1b6f3a9e Author: Pradeep Kilambi pkilambi@redhat.com Date: Fri Jul 10 18:15:34 2009 -0400
Automatic commit of package [rhn-virtualization] release [5.4.3-1].
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec index 0d701dd..6fbc57b 100644 --- a/client/tools/rhn-virtualization/rhn-virtualization.spec +++ b/client/tools/rhn-virtualization/rhn-virtualization.spec @@ -10,7 +10,7 @@ License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t...
-Version: 5.4.2 +Version: 5.4.3 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -162,6 +162,13 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE
%changelog +* Fri Jul 10 2009 Pradeep Kilambi pkilambi@redhat.com 5.4.3-1 +- 510606 - Fix rhn-virtualization package to work with kvm guests. This commit + includes fixes for > > - Guest start - We assume pygrub for any guest. This + fails for kvm as it the emulates the BIOS loading the first sector of the + boot disk and running from there. So we dont need to probe the kernel and + ramdisk. (pkilambi@redhat.com) + * Thu Jul 09 2009 John Matthews jmatthew@redhat.com 5.4.2-1 - 509602 - Fixing the is_host_domain to check both xen or kvm by virt type on libvirt connection instead of ugly file checks. This should fix the guest diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-virtualization index 1f91e00..b39a1ec 100644 --- a/rel-eng/packages/rhn-virtualization +++ b/rel-eng/packages/rhn-virtualization @@ -1 +1 @@ -5.4.2-1 client/tools/rhn-virtualization/ +5.4.3-1 client/tools/rhn-virtualization/
commit b7f69bec9c6f27fdee0f59d61f153c9aa8f99fa6 Author: Pradeep Kilambi pkilambi@redhat.com Date: Fri Jul 10 17:38:08 2009 -0400
If not commandline options given, compare the erratum channels to the already imported ones
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py index b63d4e0..6de2651 100644 --- a/backend/satellite_tools/satsync.py +++ b/backend/satellite_tools/satsync.py @@ -1796,7 +1796,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation)) # Compare with already imported channels imported_channels = _getImportedChannels() for ch in erratum['channels']: - if ch['label'] in OPTIONS.channel: + if ch['label'] in imported_channels: channels.append(ch) erratum['channels'] = channels
commit c8c1b58fddac7c0fc7a106a3c8189b6f43cb4f36 Author: Pradeep Kilambi pkilambi@redhat.com Date: Fri Jul 10 17:35:53 2009 -0400
If not commandline options given, compare the erratum channels to the already imported ones
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py index 54b785b..b63d4e0 100644 --- a/backend/satellite_tools/satsync.py +++ b/backend/satellite_tools/satsync.py @@ -1787,12 +1787,18 @@ Please contact your RHN representative""" % (generation, sat_cert.generation)) # Now fix channels # Associate errata to only channels that are being synced # Do this only if command line has channels specified. + channels = [] if OPTIONS.channel: - channels = [] for ch in erratum['channels']: if ch['label'] in OPTIONS.channel: channels.append(ch) - erratum['channels'] = channels + else: + # Compare with already imported channels + imported_channels = _getImportedChannels() + for ch in erratum['channels']: + if ch['label'] in OPTIONS.channel: + channels.append(ch) + erratum['channels'] = channels
# Now fix the files for errata_file in (erratum['files'] or []):
commit 74fa11d7264e9777ce37afaeaeecafba925141ea Author: Pradeep Kilambi pkilambi@redhat.com Date: Fri Jul 10 16:24:53 2009 -0400
compute the channel filtering only if a channel is specified in the commandline. If not, use the default
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py index 60ef130..54b785b 100644 --- a/backend/satellite_tools/satsync.py +++ b/backend/satellite_tools/satsync.py @@ -1786,11 +1786,13 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
# Now fix channels # Associate errata to only channels that are being synced - channels = [] - for ch in erratum['channels']: - if ch['label'] in OPTIONS.channel: - channels.append(ch) - erratum['channels'] = channels + # Do this only if command line has channels specified. + if OPTIONS.channel: + channels = [] + for ch in erratum['channels']: + if ch['label'] in OPTIONS.channel: + channels.append(ch) + erratum['channels'] = channels
# Now fix the files for errata_file in (erratum['files'] or []):
commit fda4132dcb668f376b840fa11e7b966f53648b9d Author: Pradeep Kilambi pkilambi@redhat.com Date: Fri Jul 10 10:57:28 2009 -0400
509206 - Fixing the guest manage actions to use virtual instead of xen when showing up in Events history page.
diff --git a/schema/spacewalk/rhnsat/tables/rhnActionType_data.sql b/schema/spacewalk/rhnsat/tables/rhnActionType_data.sql index c6b81ca..a8043a6 100644 --- a/schema/spacewalk/rhnsat/tables/rhnActionType_data.sql +++ b/schema/spacewalk/rhnsat/tables/rhnActionType_data.sql @@ -54,19 +54,19 @@ insert into rhnActionType values (32, 'rhnsd.configure', 'Spacewalk Daemon Confi insert into rhnActionType values (33, 'packages.verify', 'Verify deployed packages','N','N'); insert into rhnActionType values (34, 'rhn_applet.use_satellite', 'Allows for rhn-applet use with an Spacewalk','N','N'); insert into rhnActionType values (35, 'kickstart_guest.initiate', 'Initiate a kickstart for a virtual guest.','N','Y'); -insert into rhnActionType values (36, 'virt.shutdown', 'Shuts down a Xen domain.', 'N', 'N'); -insert into rhnActionType values (37, 'virt.start', 'Starts up a Xen domain.', 'N', 'N'); -insert into rhnActionType values (38, 'virt.suspend', 'Suspends a Xen domain.', 'N', 'N'); -insert into rhnActionType values (39, 'virt.resume', 'Resumes a Xen domain.', 'N', 'N'); -insert into rhnActionType values (40, 'virt.reboot', 'Reboots a Xen domain.', 'N', 'N'); -insert into rhnActionType values (41, 'virt.destroy', 'Destroys a Xen Domain.', 'N', 'N'); -insert into rhnActionType values (42, 'virt.setMemory', 'Sets the maximum memory usage for a Xen domain.', 'N', 'N'); +insert into rhnActionType values (36, 'virt.shutdown', 'Shuts down a virtual domain.', 'N', 'N'); +insert into rhnActionType values (37, 'virt.start', 'Starts up a virtual domain.', 'N', 'N'); +insert into rhnActionType values (38, 'virt.suspend', 'Suspends a virtual domain.', 'N', 'N'); +insert into rhnActionType values (39, 'virt.resume', 'Resumes a virtual domain.', 'N', 'N'); +insert into rhnActionType values (40, 'virt.reboot', 'Reboots a virtual domain.', 'N', 'N'); +insert into rhnActionType values (41, 'virt.destroy', 'Destroys a virtual Domain.', 'N', 'N'); +insert into rhnActionType values (42, 'virt.setMemory', 'Sets the maximum memory usage for a virtual domain.', 'N', 'N'); insert into rhnActionType values (43, 'virt.schedulePoller', 'Sets when the poller should run.', 'N', 'N'); insert into rhnActionType values (44, 'kickstart_host.schedule_virt_host_pkg_install', 'Schedule a package install of host specific functionality.', 'N', 'N'); insert into rhnActionType values (45, 'kickstart_guest.schedule_virt_guest_pkg_install', 'Schedule a package install of guest specific functionality.', 'N', 'N'); insert into rhnActionType values (46, 'kickstart_host.add_tools_channel', 'Subscribes a server to the Spacewalk Tools channel associated with its base channel.', 'N', 'N'); insert into rhnActionType values (47, 'kickstart_guest.add_tools_channel', 'Subscribes a virtualization guest to the Spacewalk Tools channel associated with its base channel.', 'N', 'N'); -insert into rhnActionType values (48, 'virt.setVCPUs', 'Sets the Vcpu usage for a Xen domain.', 'N', 'N'); +insert into rhnActionType values (48, 'virt.setVCPUs', 'Sets the Vcpu usage for a virtual domain.', 'N', 'N'); commit; insert into rhnActionType values (49, 'proxy.deactivate', 'Deactivate Proxy', 'N', 'N'); -- diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/123-rhnActionType_data.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/123-rhnActionType_data.sql index 347ddc2..d7c43fe 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/123-rhnActionType_data.sql +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/123-rhnActionType_data.sql @@ -19,3 +19,35 @@ update rhnActionType set name = 'Initiate a kickstart for a virtual guest.' where label = 'kickstart_guest.initiate'; + +update rhnActionType +set name = 'Shuts down a virtual domain.' +where label = 'virt.shutdown'; + +update rhnActionType +set name = 'Starts up a virtual domain.' +where label = 'virt.start'; + +update rhnActionType +set name = 'Suspends a virtual domain.' +where label = 'virt.suspend'; + +update rhnActionType +set name = 'Resumes a virtual domain.' +where label = 'virt.resume'; + +update rhnActionType +set name = 'Reboots a virtual domain.' +where label = 'virt.reboot'; + +update rhnActionType +set name = 'Destroys a virtual domain.' +where label = 'virt.destroy'; + +update rhnActionType +set name = 'Sets the maximum memory usage for a virtual domain.' +where label = 'virt.setMemory'; + +update rhnActionType +set name = 'Sets the Vcpu usage for a virtual domain.' +where label = 'virt.setVCPUs';
commit 309403ad69b27b46c8419d221811219606dc99a6 Author: Pradeep Kilambi pkilambi@redhat.com Date: Thu Jul 9 20:34:59 2009 -0400
510606 - Fix rhn-virtualization package to work with kvm guests. This commit includes fixes for > > - Guest start - We assume pygrub for any guest. This fails for kvm as it the emulates the BIOS loading the first sector of the boot disk and running from there. So we dont need to probe the kernel and ramdisk.
Secondly, the __fixup_config_for_restart checks for the kernel and ramdisk and removes the os block from the xml. This is ok for xen but will miserably fail for kvm and give us Unknown OS Type errors. We should not worry about bootloader or kernel/ramdisk for kvm as its taken care of by the emulator.
With this commit All KVM guest management actions should be functional except reboot. Reboot is not supported yet by libvirt.
diff --git a/client/tools/rhn-virtualization/virtualization/domain_directory.py b/client/tools/rhn-virtualization/virtualization/domain_directory.py index 65ebae9..18121a6 100644 --- a/client/tools/rhn-virtualization/virtualization/domain_directory.py +++ b/client/tools/rhn-virtualization/virtualization/domain_directory.py @@ -35,29 +35,6 @@ from virtualization.util import dehyphenize_uuid, \ ###############################################################################
CONFIG_DIR = '/etc/sysconfig/rhn/virt' -STANDARD_CONFIG_TEMPLATE = """ - <domain type='xen'> - <name>%(name)s</name> - <bootloader>/usr/bin/pygrub</bootloader> - <memory>%(mem_kb)s</memory> - <vcpu>%(vcpus)s</vcpu> - <uuid>%(uuid)s</uuid> - <on_reboot>restart</on_reboot> - <on_poweroff>destroy</on_poweroff> - <on_crash>preserve</on_crash> - <devices> - <disk type='file'> - <source file='%(disk)s'/> - <target dev='xvda'/> - </disk> - <interface type='bridge'> - <source bridge='xenbr0'/> - <mac address='%(mac)s'/> - <script path='/etc/xen/scripts/vif-bridge'/> - </interface> - </devices> - </domain> -"""
############################################################################### # Classes @@ -67,6 +44,10 @@ class DomainDirectory:
def __init__(self): self.__path = CONFIG_DIR + self.conn = libvirt.open(None) + if not self.conn: + raise VirtualizationException, \ + "Failed to open connection to hypervisor."
def get_config_path(self, uuid): cfg_filename = "%s.xml" % uuid @@ -87,29 +68,12 @@ class DomainDirectory: """ return DomainConfig(self.__path, uuid)
- def create_standard_config(self, uuid, name, mem_kb, vcpus, disk, mac): - # First, populate the XML with the appropriate values. - boot_params = { 'name' : name, - 'mem_kb' : mem_kb, - 'vcpus' : vcpus, - 'uuid' : hyphenize_uuid(uuid), - 'disk' : disk, - 'mac' : mac } - - xml = STANDARD_CONFIG_TEMPLATE % boot_params - - self.__write_xml_file(uuid, xml) - def save_unknown_domain_configs(self, domain_uuids): """ This function saves the configuration for any domains whose UUIDs are passed in the domain_uuids list. If the UUID is already known, it is skipped. """ - conn = libvirt.open(None) - if not conn: - raise VirtualizationException, \ - "Failed to open connection to hypervisor."
for uuid in domain_uuids:
@@ -124,7 +88,7 @@ class DomainDirectory:
# Lookup the domain by its uuid. try: - domain = conn.lookupByUUID(uuid_as_num) + domain = self.conn.lookupByUUID(uuid_as_num) except libvirt.libvirtError, lve: raise VirtualizationException, \ "Failed to obtain handle to domain %s: %s" % \ @@ -144,7 +108,7 @@ class DomainDirectory: if not new_config.isInstallerConfig():
# Now we'll reformat the configuration object so that it's - # valid the next time this domain runs. + # valid the next time this domain runs.. self.__fixup_config_for_restart(new_config)
# The config is now prepared. Save it and move on to the @@ -178,6 +142,15 @@ class DomainDirectory: - If it does not, ensure there is a <bootloader> section or add one if needed. """ + # Remove the domain ID from the XML. This is a runtime value that + # should not be assigned statically. + if config.hasConfigItem(DomainConfig.DOMAIN_ID): + config.removeConfigItem(DomainConfig.DOMAIN_ID) + + if self.conn.getType() == 'QEMU': + # Dont worry about bootloader if its kvm + return + boot_images_exist = 0
if config.hasConfigItem(DomainConfig.KERNEL_PATH) and \ @@ -198,10 +171,6 @@ class DomainDirectory: if not config.hasConfigItem(DomainConfig.BOOTLOADER): config.setConfigItem(DomainConfig.BOOTLOADER, "/usr/bin/pygrub")
- # Remove the domain ID from the XML. This is a runtime value that - # should not be assigned statically. - if config.hasConfigItem(DomainConfig.DOMAIN_ID): - config.removeConfigItem(DomainConfig.DOMAIN_ID)
def __write_xml_file(self, uuid, xml): cfg_pathname = self.get_config_path(uuid) diff --git a/client/tools/rhn-virtualization/virtualization/start_domain.py b/client/tools/rhn-virtualization/virtualization/start_domain.py index 1cde575..844ff64 100644 --- a/client/tools/rhn-virtualization/virtualization/start_domain.py +++ b/client/tools/rhn-virtualization/virtualization/start_domain.py @@ -41,7 +41,10 @@ def start_domain(uuid): # Load the configuration file for this UUID. domain = DomainDirectory() config = domain.load_config(uuid) - + + # Connect to the hypervisor. + connection = libvirt.open(None) + # We will attempt to determine if the domain is configured to use a # bootloader. If not, we'll have to explicitly use the kernel and initrd # data provided in the config to start the domain. @@ -49,11 +52,11 @@ def start_domain(uuid): config.getConfigItem(DomainConfig.BOOTLOADER) except DomainConfigError, dce: # No bootloader tag present. Use pygrub to extract the kernel from - # the disk image. - _prepare_guest_kernel_and_ramdisk(config) - - # Connect to the hypervisor. - connection = libvirt.open(None) + # the disk image if its Xen. For fully virt we dont have pygrub, it + # directly emulates the BIOS loading the first sector of the boot disk. + if connection.getType() == 'Xen': + # This uses pygrub which comes only with xen + _prepare_guest_kernel_and_ramdisk(config)
# Now, we'll restart the instance, this time using the re-create XML. try:
commit cb1feedc08d9f396d59e0ed03d558ba262726f19 Author: Shannon Hughes shughes@redhat.com Date: Thu Jul 9 16:25:36 2009 -0400
remove comment
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 7989c29..078fcb2 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 @@ -83,7 +83,6 @@ public class PackageDetailsAction extends RhnAction { } else { request.setAttribute("type", "rpm"); - //request.setAttribute(PACKAGE_NAME, pkg.getFile()); request.setAttribute(PACKAGE_NAME, pkg.getFilename()); }
commit 9910fee57f7d7d263ca27ebf963fcc80cb20e461 Author: Shannon Hughes shughes@redhat.com Date: Thu Jul 9 16:20:09 2009 -0400
509409 - correct package display for rhn_package_manager
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 419f3c5..7989c29 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 @@ -83,7 +83,8 @@ public class PackageDetailsAction extends RhnAction { } else { request.setAttribute("type", "rpm"); - request.setAttribute(PACKAGE_NAME, pkg.getFile()); + //request.setAttribute(PACKAGE_NAME, pkg.getFile()); + request.setAttribute(PACKAGE_NAME, pkg.getFilename()); }
if (DownloadManager.isFileAvailable(pkg.getPath())) {
commit 0463b531f5bfb585f8ebf0e5d0f0cce22a6ca9e3 Author: John Matthews jmatthew@redhat.com Date: Thu Jul 9 14:56:23 2009 -0400
Automatic commit of package [rhn-virtualization] release [5.4.2-1].
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec index fbc0bf5..0d701dd 100644 --- a/client/tools/rhn-virtualization/rhn-virtualization.spec +++ b/client/tools/rhn-virtualization/rhn-virtualization.spec @@ -10,7 +10,7 @@ License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t...
-Version: 5.4.1 +Version: 5.4.2 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -162,6 +162,12 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE
%changelog +* Thu Jul 09 2009 John Matthews jmatthew@redhat.com 5.4.2-1 +- 509602 - Fixing the is_host_domain to check both xen or kvm by virt type on + libvirt connection instead of ugly file checks. This should fix the guest + polling for kvm case and guest registrations inturn should follow thw xen + rules (pkilambi@redhat.com) + * Thu Jun 25 2009 Brad Buckingham bbuckingham@redhat.com 5.4.1-1 - 470335 - Fixing EOF error when poller tries to pickle dump the data to cache file. (pkilambi@redhat.com) diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-virtualization index e782bec..1f91e00 100644 --- a/rel-eng/packages/rhn-virtualization +++ b/rel-eng/packages/rhn-virtualization @@ -1 +1 @@ -5.4.1-1 client/tools/rhn-virtualization/ +5.4.2-1 client/tools/rhn-virtualization/
commit f2f25baf93ad0d66b8f577315ee7519babbd6412 Author: John Matthews jmatthew@redhat.com Date: Thu Jul 9 14:53:57 2009 -0400
Automatic commit of package [spacewalk-web] release [0.6.11-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 4beef97..d33060f 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -0.6.10-1 web/ +0.6.11-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index cb93f33..9de9163 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.10 +Version: 0.6.11 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -317,6 +317,11 @@ rm -rf $RPM_BUILD_ROOT
# $Id$ %changelog +* Thu Jul 09 2009 John Matthews jmatthew@redhat.com 0.6.11-1 +- 510146 - Update copyright years from 2002-08 to 2002-09. + (dgoodwin@redhat.com) +- 508980 - converting SSM kickstart to java (jsherril@redhat.com) + * Mon Jul 06 2009 John Matthews jmatthew@redhat.com 0.6.10-1 - 509376 - add Shared Channels to side navigation of Channels tab (bbuckingham@redhat.com)
commit 8f0a3a1459e4be15a6faef709968e5c6b11eefca Author: John Matthews jmatthew@redhat.com Date: Thu Jul 9 14:38:45 2009 -0400
Automatic commit of package [spacewalk-backend] release [0.6.17-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index f89dbde..6422b38 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 0.6.16 +Version: 0.6.17 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -568,6 +568,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$ %changelog +* Thu Jul 09 2009 John Matthews jmatthew@redhat.com 0.6.17-1 +- Only include the channels that are being synced to each errata. This will + help taskomatic not spam users with irrelevant errata mails + (pkilambi@redhat.com) + * Fri Jul 3 2009 Miroslav Suchy msuchy@redhat.com 0.6.16-1 - 509516 - failure to check for non-existant header (Mark Chappell m.d.chappell@bath.ac.uk) - 509444 - remove delete action system from virt page (Shannon Hughes shughes@redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 3ebd6c4..574ba2e 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.16-1 backend/ +0.6.17-1 backend/
commit d830f7f238046acdc2c7b66ab8201087811f6839 Author: John Matthews jmatthew@redhat.com Date: Thu Jul 9 14:30:19 2009 -0400
Automatic commit of package [spacewalk-java] release [0.6.32-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 05760fb..8d41d86 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -12,7 +12,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.31 +Version: 0.6.32 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -250,7 +250,7 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
%changelog -* Thu Jul 09 2009 John Matthews jmatthew@redhat.com 0.6.31-1 +* Thu Jul 09 2009 John Matthews jmatthew@redhat.com 0.6.32-1 - 510122 - ErrataSearch now filters results so it won't display errata from a non-sharing Org (jmatthew@redhat.com) - 509589 - fixing ise on single default org sys ent page (shughes@redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 4e367a8..440fb75 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.31-1 java/ +0.6.32-1 java/
commit 0e29e33b6687a7915277636b6866e372611671d9 Author: John Matthews jmatthew@redhat.com Date: Thu Jul 9 14:19:14 2009 -0400
Automatic commit of package [spacewalk-java] release [0.6.31-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 327de39..05760fb 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -12,7 +12,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.30 +Version: 0.6.31 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -250,6 +250,39 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
%changelog +* Thu Jul 09 2009 John Matthews jmatthew@redhat.com 0.6.31-1 +- 510122 - ErrataSearch now filters results so it won't display errata from a + non-sharing Org (jmatthew@redhat.com) +- 509589 - fixing ise on single default org sys ent page (shughes@redhat.com) +- 509215 - update SDC packages->upgrade to show pkg arch when available + (bbuckingham@redhat.com) +- checkstyle (jsherril@redhat.com) +- 510334 - Fix the comps.xml timestamp in repomd.xml to compute the timestamp + value correctly. (pkilambi@redhat.com) +- 510146 - Fix 2002-08 to 2002-09 copyright in non-English resource bundles. + (dgoodwin@redhat.com) +- 510146 - Update copyright years from 2002-08 to 2002-09. + (dgoodwin@redhat.com) +- 509268 - Fixed incorrect filterattr values (jason.dobies@redhat.com) +- 509589 - clean up software and system entitlement subscription pages + (shughes@redhat.com) +- 496174 - removing usage of rhnPrivateErrataMail view and tuning query + (mmccune@redhat.com) +- 508931 - bumping taskomatic default max memory to 512 and min to 256 to avoid + OutOfMemoryError's on s390 (pkilambi@redhat.com) +- fix prads oops (shughes@redhat.com) +- 509911 - Dont compute date if the file is missing that way we dont show 1969 + for last build. Also changing the jsp logic to only show as complete if both + last build and status are not null (pkilambi@redhat.com) +- 509394 - update System/Profile comparison to not display duplicate error + messages (bbuckingham@redhat.com) +- 508980 - converting SSM kickstart to java (jsherril@redhat.com) +- small request to add orgid for pkilambi (shughes@redhat.com) +- 509457 - incorrectly using user id twice in channel query + (shughes@redhat.com) +- 509377 - confirmation pgs for Pkg Install & Remove updated to include pkg + arch (bbuckingham@redhat.com) + * Mon Jul 06 2009 John Matthews jmatthew@redhat.com 0.6.30-1 - 509444 - remove delete action system from virt page (shughes@redhat.com) - 509371 - SSM->Install,Remove,Verify - minor fixes to Package Name and Arch diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 6ff39f7..4e367a8 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.30-1 java/ +0.6.31-1 java/
commit 28a72cc88d4984d21d7856bcc09ab275a1f66a45 Author: John Matthews jmatthew@redhat.com Date: Thu Jul 9 14:15:45 2009 -0400
510122 - ErrataSearch now filters results so it won't display errata from a non-sharing Org
diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java index d3962d6..08136ff 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java +++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java @@ -886,11 +886,13 @@ public class ErrataFactory extends HibernateFactory { /** * Returns a list of ErrataOverview that match the given errata ids. * @param eids Errata ids. + * @param org Organization to match results with * @return a list of ErrataOverview that match the given errata ids. */ - public static List<ErrataOverview> search(List eids) { + public static List<ErrataOverview> search(List eids, Org org) { Map params = new HashMap(); params.put("eids", eids); + params.put("org_id", org.getId()); List results = singleton.listObjectsByNamedQuery( "PublishedErrata.searchById", params); List<ErrataOverview> errata = new ArrayList<ErrataOverview>(); diff --git a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml index f82475a..70ccc7a 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml @@ -120,12 +120,25 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" order by e.issueDate ]]> </query> - <query name="PublishedErrata.searchById"> - <![CDATA[select distinct e.id, e.advisory, e.advisoryName, e.advisoryType, e.synopsis, e.updateDate, e.issueDate - from com.redhat.rhn.domain.errata.impl.PublishedErrata as e + <sql-query name="PublishedErrata.searchById"> + <![CDATA[select distinct e.id, e.advisory, e.advisory_name as advisoryName, + e.advisory_type as advisoryType, e.synopsis as advisorySynopsis, + e.update_date as updateDate, e.issue_date as issueDate + from rhnErrata e, rhnChannelErrata CE where e.id IN (:eids) + and CE.errata_id = e.id + and CE.channel_id IN(SELECT channel_id + FROM rhnAvailableChannels + WHERE org_id = :org_id) ]]> - </query> + <return-scalar column="id" type="long" /> + <return-scalar column="advisory" type="string" /> + <return-scalar column="advisoryName" type="string" /> + <return-scalar column="advisoryType" type="string" /> + <return-scalar column="advisorySynopsis" type="string" /> + <return-scalar column="updateDate" type="timestamp" /> + <return-scalar column="issueDate" type="timestamp" /> + </sql-query>
<sql-query name="PublishedErrata.searchByPackageIds"> <![CDATA[select distinct e.id, e.advisory, e.advisory_name as advisoryName, e.advisory_type as advisoryType, e.synopsis as advisorySynopsis, 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 f02c123..f3e5760 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 @@ -19,6 +19,7 @@ import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.util.DatePicker; import com.redhat.rhn.common.validator.ValidatorException; +import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.frontend.action.common.DateRangePicker; import com.redhat.rhn.frontend.action.common.DateRangePicker.DatePickerResults; import com.redhat.rhn.frontend.dto.ErrataOverview; @@ -263,6 +264,7 @@ public class ErrataSearchAction extends RhnAction {
log.warn("Performing errata search"); RequestContext ctx = new RequestContext(request); + Org org = ctx.getCurrentUser().getOrg(); // call search server XmlRpcClient client = new XmlRpcClient( ConfigDefaults.get().getSearchServerUrl(), true); @@ -362,7 +364,7 @@ public class ErrataSearchAction extends RhnAction {
} else { - unsorted = fleshOutErrataOverview(ids); + unsorted = fleshOutErrataOverview(ids, org); }
if (OPT_CVE.equals(mode)) { @@ -500,7 +502,7 @@ public class ErrataSearchAction extends RhnAction {
- private List<ErrataOverview> fleshOutErrataOverview(List<Long> idsIn) { + private List<ErrataOverview> fleshOutErrataOverview(List<Long> idsIn, Org org) { // Chunk the work to avoid issue with Oracle not liking // an input parameter list to contain more than 1000 entries. // issue most commonly seen with issue date range search @@ -517,7 +519,7 @@ public class ErrataSearchAction extends RhnAction { log.warn("Processing 0 size chunkIDs....something seems wrong."); break; } - List<ErrataOverview> temp = ErrataManager.search(chunkIDs); + List<ErrataOverview> temp = ErrataManager.search(chunkIDs, org); unsorted.addAll(temp); toIndex += chunkCount; recordsRead += chunkIDs.size(); diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java index 42aa9e4..c00742b 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -318,10 +318,11 @@ public class ErrataManager extends BaseManager { /** * Returns a list of ErrataOverview matching the given errata ids. * @param eids Errata ids sought. + * @param org Organization to match results with * @return a list of ErrataOverview matching the given errata ids. */ - public static List<ErrataOverview> search(List eids) { - return ErrataFactory.search(eids); + public static List<ErrataOverview> search(List eids, Org org) { + return ErrataFactory.search(eids, org); }
/** diff --git a/java/code/src/com/redhat/rhn/manager/errata/test/ErrataManagerTest.java b/java/code/src/com/redhat/rhn/manager/errata/test/ErrataManagerTest.java index 35e721f..23698ee 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/test/ErrataManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/errata/test/ErrataManagerTest.java @@ -18,6 +18,7 @@ import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.common.hibernate.LookupException; +import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.errata.Bug; import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.errata.ErrataFactory; @@ -40,6 +41,7 @@ import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.errata.cache.test.ErrataCacheManagerTest; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; +import com.redhat.rhn.testing.ChannelTestUtils; import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils; @@ -142,10 +144,11 @@ public class ErrataManagerTest extends RhnBaseTestCase { }
public void testSearch() throws Exception { - Package p = PackageTest.createTestPackage(); // errata search is done by the search-server. The search // in ErrataManager is to load ErrataOverview objects from // the results of the search-server searches. + User user = UserTestUtils.findNewUser("testUser", "testOrg"); + Package p = PackageTest.createTestPackage(); Errata e = ErrataManager.createNewErrata(); assertTrue(e instanceof UnpublishedErrata); e.setAdvisory("ZEUS-2007"); @@ -158,12 +161,14 @@ public class ErrataManagerTest extends RhnBaseTestCase { e.setIssueDate(new Date()); e.setUpdateDate(e.getIssueDate()); e.addPackage(p); - e = ErrataManager.publish(e); - assertTrue(e instanceof PublishedErrata); - + + Channel baseChannel = ChannelTestUtils.createBaseChannel(user); + Errata publish = ErrataFactory.publishToChannel(e, baseChannel, user); + assertTrue(publish instanceof PublishedErrata); + List eids = new ArrayList(); - eids.add(e.getId()); - List<ErrataOverview> eos = ErrataManager.search(eids); + eids.add(publish.getId()); + List<ErrataOverview> eos = ErrataManager.search(eids, user.getOrg()); assertNotNull(eos); assertEquals(1, eos.size()); }
commit 81df874b0006e61af7ba7f614be468e004973fe9 Author: Shannon Hughes shughes@redhat.com Date: Thu Jul 9 13:51:24 2009 -0400
509589 - fixing ise on single default org sys ent page
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 5d84c3b..fe5054d 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 @@ -107,12 +107,27 @@ public class SystemEntitlementOrgsAction extends RhnAction {
//Calculate System Wide Sat usage Long orgCount = OrgManager.getTotalOrgCount(user) - 1; + Long maxEnt = new Long(0); + Long curEnt = new Long(0); + Long alloc = new Long(0); + DataList satEntCounts = OrgManager.getSatEntitlementUsage(entitlementLabel); Map row = (Map) satEntCounts.get(0); - Long maxEnt = ((Long) row.get("total")).longValue(); - Long curEnt = ((Long) row.get("curr")).longValue(); - Long alloc = ((Long) row.get("alloc")).longValue(); - Long ratio = alloc * 100 / orgCount; + + if (row.get("total") != null) { + maxEnt = ((Long) row.get("total")).longValue(); + } + if (row.get("curr") != null) { + curEnt = ((Long) row.get("curr")).longValue(); + } + if (row.get("alloc") != null) { + alloc = ((Long) row.get("alloc")).longValue(); + } + + Long ratio = new Long(0); + if (orgCount != 0) { + ratio = alloc * 100 / orgCount; + }
request.setAttribute("maxEnt", maxEnt); request.setAttribute("curEnt", curEnt); 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 dbb4dd0..6909255 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 @@ -19496,6 +19496,13 @@ as reflected in this @@PRODUCT_NAME@@'s certificate.</source> <context context-type="sourcefile">/rhn/admin/multiorg/SystemEntitlements.do</context> </context-group> </trans-unit> + + <trans-unit id="sys_entitlements.noentorgs"> + <source>No organizations have this entitlement</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/admin/multiorg/SystemEntitlements.do</context> + </context-group> + </trans-unit>
<trans-unit id="kickstart.cryptokey.description"> <source>Description</source> diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp index b69c3fd..bc25ac2 100644 --- a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp @@ -41,7 +41,7 @@ imgAlt="users.jsp.imgAlt"> name="pageList" filter="com.redhat.rhn.frontend.action.multiorg.SystemEntitlementOrgsFilter" styleclass="list" - emptykey="sys_entitlements.noentitlements"> + emptykey="sys_entitlements.noentorgs"> <rl:column bound="false" sortable="false" headerkey="entitlementorgs.orgname"
commit 9786099b19ab667e0d1b7d830d621e948d659d8a Author: Brad Buckingham bbuckingham@redhat.com Date: Wed Jul 8 18:48:15 2009 -0400
509215 - update SDC packages->upgrade to show pkg arch when available
The current page doesn't show the arch of the packages available for upgrade. While this isn't typically an issue for an i386 system, it would be useful for x86_64 systems that can have packages that are both i386 and x86_64.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml index 907b496..af14eb6 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml @@ -745,59 +745,48 @@ ORDER BY UPPER(PN.name)
<mode name="system_upgradable_package_list" class="com.redhat.rhn.frontend.dto.UpgradablePackageListItem"> <query params="sid"> -SELECT pn.id AS id, - pn.name AS name, - pn.name ||'-'|| full_list.evr.version || '-' || full_list.evr.release || DECODE(full_list.evr.epoch, NULL, '', ':' || full_list.evr.epoch) AS nvre, - pn.id || '|' || lookup_evr(full_list.evr.epoch, full_list.evr.version, full_list.evr.release)|| '|' || full_list.arch_id AS id_combo +SELECT PN.id AS id, + PN.id AS name_id, + lookup_evr(latest.evr.epoch, latest.evr.version, latest.evr.release) AS evr_id, + latest.arch_id AS arch_id, + latest.evr.epoch AS epoch, + latest.evr.version AS version, + latest.evr.release AS release, + PN.name AS name, + PN.name ||'-'|| latest.evr.version || '-' || latest.evr.release || DECODE(latest.evr.epoch, NULL, '', ':' || latest.evr.epoch) || (CASE WHEN latest.arch_id IS NULL THEN '' ELSE '.' || latest.arch_label END) AS nvrea, + PN.name || '-' || PE.evr.as_vre_simple() || (CASE WHEN SP.package_arch_id IS NULL THEN '' ELSE '.' || PA.label END) AS installed_package, + PN.id || '|' || lookup_evr(latest.evr.epoch, latest.evr.version, latest.evr.release)|| '|' || latest.arch_id AS id_combo FROM rhnPackageName PN, + rhnServerPackage SP + INNER JOIN rhnPackageEVR PE on SP.evr_id = PE.id + LEFT JOIN rhnPackageArch PA on SP.package_arch_id = PA.id, ( SELECT SOP.package_name_id AS name_id, MAX(PE.evr) evr, - SP.package_arch_id as arch_id - FROM rhnPackageEVR PE, rhnServerOutdatedPackages SOP + SP.package_arch_id as arch_id, PA.label as arch_label + FROM rhnServerOutdatedPackages SOP INNER JOIN rhnServerPackage SP on SP.server_id = SOP.server_id + INNER JOIN rhnPackageEVR PE on SOP.package_evr_id = PE.id + LEFT JOIN rhnPackageArch PA on PA.id = SP.package_arch_id WHERE SOP.server_id = :sid AND SOP.package_name_id = SP.name_id - AND SOP.package_evr_id = PE.id - GROUP BY SOP.package_name_id, SP.package_arch_id - ) full_list - WHERE full_list.name_id = PN.id + GROUP BY SOP.package_name_id, SP.package_arch_id, PA.label + ) latest + WHERE latest.name_id = PN.id + AND SP.server_id = :sid + AND SP.name_id = PN.id + AND (SP.package_arch_id IS NULL OR SP.package_arch_id = latest.arch_id) ORDER BY UPPER(PN.name) </query> - <elaborator params="sid" multiple="t"> -SELECT PN.id AS id, - PN.id as name_id, - pn.name ||'-'|| full_list.evr.version || '-' || full_list.evr.release || DECODE(full_list.evr.epoch, NULL, '', ':' || full_list.evr.epoch) AS nvre, - lookup_evr(full_list.evr.epoch, full_list.evr.version, full_list.evr.release) AS evr_id, - PN.name || '-' || SPE.evr.as_vre_simple() AS installed, - full_list.server_id SERVER_ID, - full_list.errata_id ERRATA_ID, - full_list.errata_advisory ERRATA_ADVISORY, - full_list.evr.epoch EPOCH, - full_list.evr.version VERSION, - full_list.evr.release RELEASE, - E.advisory_type ERRATA_ADVISORY_TYPE - FROM rhnErrata E, - rhnPackageName PN, - rhnPackageEVR PE, - rhnPackageEVR SPE, - rhnServerPackage SP, - ( - SELECT SOP.package_name_id name_id, MAX(peD.evr) evr, - SOP.server_id server_id, SOP.errata_id errata_id, - SOP.errata_advisory errata_advisory - FROM rhnPackageEVR PED, rhnServerOutdatedPackages SOP - WHERE SOP.server_id = :sid - AND SOP.package_evr_id = PED.id - GROUP BY SOP.package_name_id, SOP.server_id, SOP.errata_id, SOP.errata_advisory - ) full_list - WHERE PN.id IN (%s) - AND PN.id = full_list.name_id - AND full_list.errata_id = E.id (+) - AND PE.id = lookup_evr(full_list.evr.epoch, full_list.evr.version, full_list.evr.release) - AND SP.name_id = PN.id - AND SP.server_id = :sid - AND SPE.id = SP.evr_id - AND SPE.evr < PE.evr + <elaborator multiple="t" params="sid"> + SELECT PN.id AS id, + SOP.errata_id AS errata_id, + SOP.errata_advisory AS errata_advisory, + E.advisory_type AS errata_advisory_type + FROM rhnServerOutdatedPackages SOP + INNER JOIN rhnPackageName PN on SOP.package_name_id = PN.id + INNER JOIN rhnErrata E on SOP.errata_id = E.id + WHERE PN.id IN (%s) + AND SOP.server_id = :sid </elaborator> </mode>
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/UpgradablePackageListItem.java b/java/code/src/com/redhat/rhn/frontend/dto/UpgradablePackageListItem.java index c6ecee4..acd6322 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/UpgradablePackageListItem.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/UpgradablePackageListItem.java @@ -32,6 +32,7 @@ public class UpgradablePackageListItem extends PackageListItem { private List errataAdvisory = new ArrayList(); private List errataAdvisoryType = new ArrayList();; private Set installed; + private String installedPackage = new String();
/** * @return Returns the installed. @@ -46,6 +47,18 @@ public class UpgradablePackageListItem extends PackageListItem { this.installed = new HashSet(installedIn); }
+ /** + * @return Returns the installed package. + */ + public String getInstalledPackage() { + return installedPackage; + } + /** + * @param installedPackageIn The installed package. + */ + public void setInstalledPackage(String installedPackageIn) { + this.installedPackage = installedPackageIn; + }
/** * @return Returns the serverId. diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp index 656d612..d4646f4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp @@ -28,7 +28,7 @@ width="100%" name="packageList" emptykey="packagelist.jsp.nopackages" - alphabarcolumn="nvre"> + alphabarcolumn="nvrea"> <rl:decorator name="PageSizeDecorator"/> <rl:decorator name="ElaborationDecorator"/> <rl:decorator name="SelectableDecorator"/> @@ -38,17 +38,15 @@ styleclass="first-column"/>
<rl:column headerkey="upgradable.jsp.latest" bound="false" - sortattr="nvre" - sortable="true" filterattr="nvre"> + sortattr="nvrea" + sortable="true" filterattr="nvrea"> <a href="/rhn/software/packages/Details.do?sid=${param.sid}&id_combo=${current.idCombo}"> - ${current.nvre}</a> + ${current.nvrea}</a> </rl:column> <rl:column headerkey="upgradable.jsp.installed" bound="false"> - <c:forEach items="${current.installed}" var="package"> - ${package} <br/> - </c:forEach> + ${current.installedPackage} </rl:column> <rl:column headerkey="upgradable.jsp.errata" styleclass="last-column">
commit 845d189e9b6e99a9b602aa202cbac7ff92d98b18 Author: Justin Sherrill jsherril@redhat.com Date: Wed Jul 8 16:48:33 2009 -0400
checkstyle
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartHelperTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartHelperTest.java index cdfefa4..c81b51c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartHelperTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartHelperTest.java @@ -23,16 +23,11 @@ import com.redhat.rhn.domain.kickstart.KickstartIpRange; import com.redhat.rhn.domain.kickstart.KickstartSession; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.domain.kickstart.test.KickstartSessionTest; -import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.role.RoleFactory; -import com.redhat.rhn.domain.server.NetworkInterface; -import com.redhat.rhn.domain.server.Server; -import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.frontend.action.kickstart.KickstartHelper; import com.redhat.rhn.frontend.servlets.RhnHttpServletRequest; import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.manager.kickstart.IpAddress; import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest; import com.redhat.rhn.testing.BaseTestCaseWithUser; import com.redhat.rhn.testing.ChannelTestUtils; @@ -90,7 +85,7 @@ public class KickstartHelperTest extends BaseTestCaseWithUser { assertNull(options.get("session")); }
- public void testIpRangeLabel() throws Exception{ + public void testIpRangeLabel() throws Exception {
KickstartIpRange range = new KickstartIpRange();
commit 60fd79087b55e854680bee9174959e9f54753490 Author: Pradeep Kilambi pkilambi@redhat.com Date: Wed Jul 8 14:23:18 2009 -0400
510334 - Fix the comps.xml timestamp in repomd.xml to compute the timestamp value correctly.
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java index 1655f1d..2b88668 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java @@ -254,7 +254,7 @@ public class RepositoryWriter { return null; }
- Date timeStamp = new Date(compsFile.lastModified() * 1000); + Date timeStamp = new Date(compsFile.lastModified());
return new RepomdIndexData(StringUtil.getHexString(digestStream .getMessageDigest().digest()), null, timeStamp);
commit 2f9e9fab38cf2564ff2137e88439e72afe13c6aa Author: Devan Goodwin dgoodwin@redhat.com Date: Wed Jul 8 13:36:55 2009 -0300
510146 - Fix 2002-08 to 2002-09 copyright in non-English resource bundles.
In this case we are going to modify them ourselves.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml index f25a4ea..526544f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml @@ -1555,7 +1555,7 @@ <target>{0}-টি সিস্টেম নির্বাচন করা হয়েছে</target> </trans-unit> <trans-unit id="footer.jsp.copyright"> - <source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> + <source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> <target>স্বত্বাধিকার &#169; ২০০২-০৮ Red Hat, Inc। সর্ব স্বত্ব সংরক্ষিত।</target> </trans-unit> <trans-unit id="footer.jsp.legalStatement"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml index c7c5030..fcf0b4e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml @@ -1555,8 +1555,8 @@ <target>{0} Systeme ausgew&auml;hlt</target> </trans-unit> <trans-unit id="footer.jsp.copyright"> - <source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> - <target>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</target> + <source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> + <target>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</target> </trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml index 80fe205..fdb60d7 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 @@ -1555,8 +1555,8 @@ <target>{0} sistemas seleccionados</target> </trans-unit> <trans-unit id="footer.jsp.copyright"> - <source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> - <target>Copyright &#169; 2002-08 Red Hat, Inc. Todos los derechos reservados.</target> + <source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> + <target>Copyright &#169; 2002-09 Red Hat, Inc. Todos los derechos reservados.</target> </trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml index 6dcd084..eede6e6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml @@ -1555,8 +1555,8 @@ <target>{0} systèmes sélectionnés</target> </trans-unit> <trans-unit id="footer.jsp.copyright"> - <source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> - <target>Copyright &#169; 2002-08 Red Hat, Inc. Tous droits réservés.</target> + <source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> + <target>Copyright &#169; 2002-09 Red Hat, Inc. Tous droits réservés.</target> </trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml index 60b136f..c180c8f 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml @@ -1555,8 +1555,8 @@ <target>{0} સિસ્ટમો પસંદ થયેલ છે</target> </trans-unit> <trans-unit id="footer.jsp.copyright"> - <source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> - <target>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</target> + <source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> + <target>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</target> </trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml index 651d539..f01c25a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml @@ -1555,8 +1555,8 @@ <target>{0} सिस्टम चुना गया</target> </trans-unit> <trans-unit id="footer.jsp.copyright"> - <source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> - <target>कॉपीराइट &#169; 2002-08 Red Hat, Inc. सर्वाधिकार सुरक्षित.</target> + <source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> + <target>कॉपीराइट &#169; 2002-09 Red Hat, Inc. सर्वाधिकार सुरक्षित.</target> </trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml index c9d0bc6..376eaee 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml @@ -1555,8 +1555,8 @@ <target>{0} sistemi selezionati</target> </trans-unit> <trans-unit id="footer.jsp.copyright"> - <source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> - <target>Copyright &#169; 2002-08 Red Hat, Inc. Tutti i diritti riservati.</target> + <source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> + <target>Copyright &#169; 2002-09 Red Hat, Inc. Tutti i diritti riservati.</target> </trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml index 7b1cc70..4455659 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml @@ -1555,8 +1555,8 @@ <target>{0} システムが選択されました</target> </trans-unit> <trans-unit id="footer.jsp.copyright"> - <source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> - <target>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</target> + <source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> + <target>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</target> </trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml index ce9fa45..0650fb3 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml @@ -1555,8 +1555,8 @@ <target>{0} 시스템이 선택되었습니다</target> </trans-unit> <trans-unit id="footer.jsp.copyright"> - <source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> - <target>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</target> + <source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> + <target>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</target> </trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml index 90d3b63..c63edef 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml @@ -1555,8 +1555,8 @@ <target>{0} ਸਿਸਟਮ ਚੁਣੇ ਗਏ</target> </trans-unit> <trans-unit id="footer.jsp.copyright"> - <source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> - <target>ਕਾਪੀਰਾਈਟ &#169; 2002-08 Red Hat, Inc. ਸਭ ਹੱਕ ਰਾਖਵੇਂ ਹਨ।</target> + <source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> + <target>ਕਾਪੀਰਾਈਟ &#169; 2002-09 Red Hat, Inc. ਸਭ ਹੱਕ ਰਾਖਵੇਂ ਹਨ।</target> </trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml index 8ee7e65..184a29e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml @@ -1555,8 +1555,8 @@ <target>{0} sistemas selecionados</target> </trans-unit> <trans-unit id="footer.jsp.copyright"> - <source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> - <target>Direitos Autorais &#169; 2002-08 Red Hat, Inc. Todos os direitos reservados.</target> + <source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> + <target>Direitos Autorais &#169; 2002-09 Red Hat, Inc. Todos os direitos reservados.</target> </trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml index 4551786..dc3af35 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml @@ -1555,8 +1555,8 @@ <target>{0} систем(ы) выбрано</target> </trans-unit> <trans-unit id="footer.jsp.copyright"> - <source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> - <target>&#169; 2002-08 Red Hat, Inc. Все права защищены.</target> + <source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> + <target>&#169; 2002-09 Red Hat, Inc. Все права защищены.</target> </trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml index 3a2af82..5307384 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml @@ -1555,8 +1555,8 @@ <target>{0} கணினிகள் தேர்வு செய்யப்பட்டன</target> </trans-unit> <trans-unit id="footer.jsp.copyright"> - <source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> - <target>பதிப்புரிமை &#169; 2002-08 Red Hat, Inc. அனைத்து உரிமைகளும் உள்ளடக்கியது.</target> + <source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> + <target>பதிப்புரிமை &#169; 2002-09 Red Hat, Inc. அனைத்து உரிமைகளும் உள்ளடக்கியது.</target> </trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml index f127a6d..e340390 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml @@ -1555,8 +1555,8 @@ <target>选择 {0} 个系统</target> </trans-unit> <trans-unit id="footer.jsp.copyright"> - <source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> - <target>版权 &#169; 2002-08 红帽公司版权所有。</target> + <source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> + <target>版权 &#169; 2002-09 红帽公司版权所有。</target> </trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml index bcdca01..2f96351 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml @@ -1555,8 +1555,8 @@ <target>選擇了 {0} 部系統</target> </trans-unit> <trans-unit id="footer.jsp.copyright"> - <source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> - <target>版權所有 &#169; 2002-08 Red Hat, Inc. 保留所有權利。</target> + <source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> + <target>版權所有 &#169; 2002-09 Red Hat, Inc. 保留所有權利。</target> </trans-unit> <trans-unit id="footer.jsp.legalStatement"> <source>Legal statement</source>
commit 2ec58bddd9f68a0e4e11782cd7170e620e82d9b5 Author: Justin Sherrill jsherril@redhat.com Date: Wed Jul 8 11:59:52 2009 -0400
unit test fix
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartHelperTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartHelperTest.java index 57f7df8..cdfefa4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartHelperTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartHelperTest.java @@ -19,11 +19,15 @@ import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.KickstartInstallType; +import com.redhat.rhn.domain.kickstart.KickstartIpRange; import com.redhat.rhn.domain.kickstart.KickstartSession; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.domain.kickstart.test.KickstartSessionTest; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.role.RoleFactory; +import com.redhat.rhn.domain.server.NetworkInterface; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.frontend.action.kickstart.KickstartHelper; import com.redhat.rhn.frontend.servlets.RhnHttpServletRequest; @@ -86,20 +90,28 @@ public class KickstartHelperTest extends BaseTestCaseWithUser { assertNull(options.get("session")); }
- public void testIpRangeLabel() { + public void testIpRangeLabel() throws Exception{ + + + KickstartIpRange range = new KickstartIpRange(); + range.setMaxString("127.0.0.2"); + range.setMinString("127.0.0.1"); + range.setKsdata(ksdata); + range.setOrg(user.getOrg()); + ksdata.getIps().add(range); + // URL: String url = "http://rhn.redhat.com/ks/cfg/org/" + user.getOrg().getId().toString() + "/mode/ip_range"; request.setAttribute(RequestContext.REQUESTED_URI, url); - helper = new KickstartHelper(request) { - protected KickstartData findBestFitProfile(IpAddress clientIpIn, Org orgIn) { - return ksdata; - } - }; + helper = new KickstartHelper(request); Map options = helper.parseKickstartUrl(url); - assertNotNull(options.get("ksdata")); + + assertEquals(ksdata, options.get("ksdata")); // This is the key test + + assertNotNull(options.get("session")); }
commit c9e1cd8ec797e564b837c5de42f7519157d15ee1 Author: Justin Sherrill jsherril@redhat.com Date: Wed Jul 8 10:59:56 2009 -0400
unit test fixes
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java index 79fddec..cdde3b7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java @@ -223,7 +223,6 @@ public class ScheduleKickstartWizardTest extends RhnMockStrutsTestCase {
// TODO Figure out why this is breaking on digdug //assertNotNull(KickstartFactory.lookupKickstartSessionByServer(s.getId())); - verifyFormValue("useExistingProfile", Boolean.TRUE.toString()); if (addProxy && proxy != null) { verifyFormValue(ScheduleKickstartWizardAction.PROXY_HOST, proxy.getId().toString()); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java index 753cdde..9b9ee37 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java @@ -187,7 +187,7 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase { ksdata, profileType, activationKeyIds, otherServerId, profileId); assertNull(cmd.store()); assertNotNull(SystemManager.listProxies(user.getOrg())); - assertEquals(0, SystemManager.listProxies(user.getOrg())); + assertEquals(0, SystemManager.listProxies(user.getOrg()).size()); }
public void testCommandPackageProfile() throws Exception {
commit ca594c77a242a6282a91e88d21117aeec7e277cc Author: Devan Goodwin dgoodwin@redhat.com Date: Wed Jul 8 10:00:00 2009 -0300
510146 - Update copyright years from 2002-08 to 2002-09.
diff --git a/branding/templates/footer.pxt b/branding/templates/footer.pxt index c829bff..7595bee 100644 --- a/branding/templates/footer.pxt +++ b/branding/templates/footer.pxt @@ -4,7 +4,7 @@ <pxt-use class="Sniglets::Utils" /> <pxt-use class="Sniglets::Users" /> <div id="footer"> - Copyright © 2002-08 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> + Copyright © 2002-09 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> <div style="color: black"> Spacewalk release <a href="/rhn/help/release-notes/satellite/index.jsp"><pxt-config var="version" /></a> </div> 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 995597a..dbb4dd0 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 @@ -1422,7 +1422,7 @@ </trans-unit> <!-- footer.jsp --> <trans-unit id="footer.jsp.copyright"> -<source>Copyright &#169; 2002-08 Red Hat, Inc. All rights reserved.</source> +<source>Copyright &#169; 2002-09 Red Hat, Inc. All rights reserved.</source> <context-group name="ctx"> <context context-type="sourcefile">./includes/footer.jsp</context> </context-group> diff --git a/web/html/errors/403.html b/web/html/errors/403.html index 530c7f9..5b990c5 100644 --- a/web/html/errors/403.html +++ b/web/html/errors/403.html @@ -131,7 +131,7 @@ </tbody></table>
<div id="footer"> - Copyright © 2002-08 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> + Copyright © 2002-09 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> </div>
</div> <!-- close content --> diff --git a/web/html/errors/404.html b/web/html/errors/404.html index b7b489a..6481f2c 100644 --- a/web/html/errors/404.html +++ b/web/html/errors/404.html @@ -114,7 +114,7 @@ </tbody></table>
<div id="footer"> - Copyright © 2002-08 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> + Copyright © 2002-09 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> </div>
</div> <!-- close content --> diff --git a/web/html/errors/413.html b/web/html/errors/413.html index 5670692..bc041e5 100644 --- a/web/html/errors/413.html +++ b/web/html/errors/413.html @@ -122,7 +122,7 @@ </tbody></table>
<div id="footer"> - Copyright © 2002-08 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> + Copyright © 2002-09 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> </div>
</div> <!-- close content --> diff --git a/web/html/errors/500.html b/web/html/errors/500.html index a5237a8..b49b1e5 100644 --- a/web/html/errors/500.html +++ b/web/html/errors/500.html @@ -126,7 +126,7 @@ </tbody></table>
<div id="footer"> - Copyright © 2002-08 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> + Copyright © 2002-09 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> </div>
</div> <!-- close content -->
commit 204956469b2c14beb772882b8163b82354cd90ec Author: Pradeep Kilambi pkilambi@redhat.com Date: Wed Jul 8 00:24:33 2009 -0400
509602 - Fixing the is_host_domain to check both xen or kvm by virt type on libvirt connection instead of ugly file checks. This should fix the guest polling for kvm case and guest registrations inturn should follow thw xen rules
diff --git a/client/tools/rhn-virtualization/virtualization/support.py b/client/tools/rhn-virtualization/virtualization/support.py index d449bee..2657a71 100755 --- a/client/tools/rhn-virtualization/virtualization/support.py +++ b/client/tools/rhn-virtualization/virtualization/support.py @@ -157,10 +157,15 @@ def _is_host_domain(): This function returns true if this system is currently a host domain. Simply having virtualization enabled is sufficient.
- We can figure out if Xen is running by checking for the existence of - /proc/xen. - """ - return os.path.exists('/proc/xen') and libvirt + We can figure out if Xen/Qemu is running by checking for the type + """ + if not libvirt: + # No libvirt, dont bother with the rest + return False + conn = libvirt.open(None) + if conn and conn.getType() in ['Xen', 'QEMU']: + return True + return False
def _fetch_host_uuid(): """
commit 01c5eba213856f5d4050a6ec1e6005edd07749c2 Author: Jason Dobies jason.dobies@redhat.com Date: Tue Jul 7 16:48:36 2009 -0400
509268 - Fixed incorrect filterattr values
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp index d6ffee4..d7894f5 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageremove.jsp @@ -32,7 +32,7 @@ styleclass="first-column"/>
<rl:column headerkey="packagelist.jsp.packagename" bound="false" - sortattr="nvre" sortable="true" filterattr="name"> + sortattr="nvre" sortable="true" filterattr="nvre"> <c:out value="${current.nvre}" escapeXml="false"/> </rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp index ac21c81..a99e699 100644 --- a/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp +++ b/java/code/webapp/WEB-INF/pages/ssm/packageverify.jsp @@ -32,7 +32,7 @@ styleclass="first-column"/>
<rl:column headerkey="packagelist.jsp.packagename" bound="false" - sortattr="nvre" sortable="true" filterattr="name"> + sortattr="nvre" sortable="true" filterattr="nvre"> <c:out value="${current.nvre}" escapeXml="false"/> </rl:column>
commit 851ad15f66abd3843b7892a8b434e576adaa77ca Author: Pradeep Kilambi pkilambi@redhat.com Date: Tue Jul 7 16:09:35 2009 -0400
#503719 - fix for postun scriptlet error
diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec index d18b3b9..71f28e7 100644 --- a/client/rhel/rhnsd/rhnsd.spec +++ b/client/rhel/rhnsd/rhnsd.spec @@ -43,7 +43,7 @@ fi
%postun if [ "$1" -ge "1" ]; then - /etc/rc.d/init.d/rhnsd condrestart >/dev/null 2>&1 + /etc/rc.d/init.d/rhnsd condrestart >/dev/null 2>&1 || : fi
%clean @@ -58,6 +58,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man8/rhnsd.8*
%changelog +* Tue Jul 7 2009 Pradeep Kilambi pkilambi@redhat.com +- Resolves: #503719 - fix for postun scriptlet error + * Thu Jun 25 2009 John Matthews jmatthew@redhat.com 4.5.10-1 - 243699: fixing the error code when unknown command is used with rhnsd init (pkilambi@redhat.com)
commit 80c44847235b453dc1c5b34f997c7873c3bd3550 Author: Shannon Hughes shughes@redhat.com Date: Tue Jul 7 15:51:14 2009 -0400
509589 - clean up software and system entitlement subsription pages
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 bfb6b6e..b9fcf34 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 @@ -14,6 +14,20 @@ */ package com.redhat.rhn.frontend.action.multiorg;
+import java.util.Iterator; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; + import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.channel.ChannelFamily; import com.redhat.rhn.domain.channel.ChannelFamilyFactory; @@ -29,19 +43,6 @@ import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.org.OrgManager; import com.redhat.rhn.manager.org.UpdateOrgSoftwareEntitlementsCommand;
-import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.DynaActionForm; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -
/** * SoftwareEntitlementSubscriptionsAction @@ -125,6 +126,14 @@ public class SoftwareEntitlementSubscriptionsAction extends RhnAction { List<OrgSoftwareEntitlementDto> entitlementUsage = ChannelManager.listEntitlementsForAllOrgsWithEmptyOrgs(cf, user);
+ for (Iterator <OrgSoftwareEntitlementDto> itr = + entitlementUsage.iterator(); itr.hasNext();) { + OrgSoftwareEntitlementDto dto = itr.next(); + if (satelliteOrg.equals(dto.getOrg())) { + itr.remove(); + } + } + ChannelOverview satelliteOrgOverview = ChannelManager.getEntitlement( satelliteOrg.getId(), cf.getId()); if (satelliteOrgOverview == null) { @@ -146,10 +155,14 @@ public class SoftwareEntitlementSubscriptionsAction extends RhnAction { Long entitlementsCurrentMembers = new Long(0); Long entitlementRatio = new Long(0); Long orgRatio = new Long(0); - Long entitledOrgs = new Long(0); - Long orgCount = OrgManager.getTotalOrgCount(user); - - for (ChannelOverview co : channelOverviews) { + Long entitledOrgs = new Long(0); + // don't include default org + Long orgCount = OrgManager.getTotalOrgCount(user) - 1; + + for (ChannelOverview co : channelOverviews) { + if (co.getOrgId().equals(satelliteOrg.getId())) { + continue; + } entitlementsCurrentMembers += co.getCurrentMembers();
entitlementsMaxMembers += co.getMaxMembers(); 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 c1ff0e7..5d84c3b 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 @@ -14,6 +14,20 @@ */ package com.redhat.rhn.frontend.action.multiorg;
+import java.util.Iterator; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; + import com.redhat.rhn.common.db.datasource.DataList; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.entitlement.Entitlement; @@ -27,19 +41,6 @@ import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.org.OrgManager; import com.redhat.rhn.manager.org.UpdateOrgSystemEntitlementsCommand;
-import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.DynaActionForm; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * SystemEntitlementOrgsAction */ @@ -89,6 +90,15 @@ public class SystemEntitlementOrgsAction extends RhnAction { OrgManager.allOrgsSingleEntitlementWithEmptyOrgs(entitlementLabel); Org satelliteOrg = OrgFactory.getSatelliteOrg();
+ //remove default org + for (Iterator<Map> itr = result.iterator(); itr.hasNext();) { + Map row = itr.next(); + if (satelliteOrg.getId().equals(row.get("orgid"))) { + itr.remove(); + break; + } + } + request.setAttribute("egntname", entitlementLabel); request.setAttribute("enthuman", e.getHumanReadableLabel()); request.setAttribute("pageList", result); @@ -96,7 +106,7 @@ public class SystemEntitlementOrgsAction extends RhnAction { "?label=" + entitlementLabel);
//Calculate System Wide Sat usage - Long orgCount = OrgManager.getTotalOrgCount(user); + Long orgCount = OrgManager.getTotalOrgCount(user) - 1; DataList satEntCounts = OrgManager.getSatEntitlementUsage(entitlementLabel); Map row = (Map) satEntCounts.get(0); Long maxEnt = ((Long) row.get("total")).longValue(); 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 21a817e..995597a 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 @@ -4600,7 +4600,7 @@ deducted from the default organization.</source> </trans-unit> <trans-unit id="softwareEntitlementSubs.systemWideCounts.totaltip"> <source><strong>Tip:</strong> This total corresponds to your @@PRODUCT_NAME@@ certificate's -value for this entitlement.</source> +value for this entitlement, excluding the default organization's consumption.</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/admin/multiorg/SoftwareEntitlementSubscriptions</context> </context-group> @@ -19692,7 +19692,7 @@ this entitlement.</source> </trans-unit> <trans-unit id="entitlementorgs.tip_allocated"> <source><strong>Tip:</strong> This total corresponds to your @@PRODUCT_NAME@@ certificate's -value for this entitlement.</source> +value for this entitlement, excluding the default organization's consumption.</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/admin/multiorg/SystemEntitlementOrgs</context> </context-group>
commit bf5d619b033efdf778f9d092d4a78a16d32922a1 Author: Mike McCune mmccune@redhat.com Date: Tue Jul 7 12:30:33 2009 -0700
496174 - removing usage of rhnPrivateErrataMail view and tuning query
The only place that used the rhnPrivateErrataMail view was in this task query. The view was sub-optimal and I replaced it with a less complex version that should not blow up TEMP_TBS while running.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml index 96f7961..a293d7b 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml @@ -460,12 +460,47 @@ ORDER BY next_action DESC <query params="errata_id,org_id, channel_id"> INSERT INTO rhnPaidErrataTempCache (user_id, server_id, errata_id) - SELECT DISTINCT PEM.user_id, PEM.server_id, :errata_id - FROM rhnPrivateErrataMail PEM, rhnServerChannel SC - WHERE PEM.server_id = SC.server_id - AND SC.channel_id = :channel_id - AND PEM.errata_id = :errata_id - AND PEM.org_id = :org_id +SELECT DISTINCT USP.user_id, + S.id as server_id, + :errata_id +FROM + rhnPackage P + inner join rhnPackageEVR P_EVR on P_EVR.id = P.evr_id + inner join rhnPackageEVR SP_EVR on SP_EVR.evr < P_EVR.evr + inner join rhnServerPackage SP on SP.name_id = P.name_id + and SP.evr_id = SP_EVR.id + AND SP.evr_id != P.evr_id + inner join rhnServer S on SP.server_id = S.id + inner join rhnServerPackageArchCompat SPAC on spac.server_arch_id = s.server_arch_id + AND p.package_arch_id = spac.package_arch_id + inner join rhnServerChannel SC on SC.server_id = S.id + inner join rhnUserServerPerms USP on USP.server_id = S.id + inner join web_user_personal_info WPI on WPI.web_user_id = USP.user_id + inner join rhnUserInfo UI on UI.user_id = USP.user_id + inner join rhnChannelPackage CP on CP.package_id = P.id + and SC.channel_id = CP.channel_id + inner join rhnErrataPackage EP on EP.package_id = P.id + AND EXISTS + (SELECT 1 from rhnChannelErrata CE where ce.channel_id = SC.channel_id + AND CE.errata_id = EP.errata_id) + where SP_EVR.evr = (SELECT MAX(PE.evr) FROM rhnServerPackage SP2, rhnPackageEvr PE + WHERE PE.id = SP2.evr_id AND SP2.server_id = SP.server_id AND + SP2.name_id = SP.name_id) + and not exists ( + select usprefs.server_id + from rhnUserServerPrefs usprefs + where usprefs.user_id = USP.user_id + and sc.server_id = usprefs.server_id + and usprefs.name = 'receive_notifications' + ) + and ui.email_notify = 1 + and not exists ( select 1 + from rhnWebContactDisabled wcd + where wcd.id = USP.user_id ) + and WPI.email is not null + AND SC.channel_id = :channel_id + AND S.org_id = :org_id + AND EP.errata_id = :errata_id </query> </write-mode>
commit 58bbc2f18af62a8447ac7181604000a22a8c2f34 Author: Pradeep Kilambi pkilambi@redhat.com Date: Tue Jul 7 14:21:25 2009 -0400
Only include the channels that are being synced to each errata. This will help taskomatic not spam users with irrelevant errata mails
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py index 3c44efb..60ef130 100644 --- a/backend/satellite_tools/satsync.py +++ b/backend/satellite_tools/satsync.py @@ -1784,6 +1784,14 @@ Please contact your RHN representative""" % (generation, sat_cert.generation)) if OPTIONS.orgid is not None: erratum['org_id'] = OPTIONS.orgid
+ # Now fix channels + # Associate errata to only channels that are being synced + channels = [] + for ch in erratum['channels']: + if ch['label'] in OPTIONS.channel: + channels.append(ch) + erratum['channels'] = channels + # Now fix the files for errata_file in (erratum['files'] or []): errata_file_package = errata_file.get('package')
commit af48c1aaea332cb2f2477fd376806ad0b93906c9 Author: Pradeep Kilambi pkilambi@redhat.com Date: Tue Jul 7 13:15:21 2009 -0400
508931 - bumping taskomatic default max memory to 512 and min to 256 to avoid OutOfMemoryError's on s390
diff --git a/java/conf/default/rhn_taskomatic_daemon.conf b/java/conf/default/rhn_taskomatic_daemon.conf index 131192f..0e5dd73 100644 --- a/java/conf/default/rhn_taskomatic_daemon.conf +++ b/java/conf/default/rhn_taskomatic_daemon.conf @@ -77,10 +77,10 @@ wrapper.java.classpath.53=/usr/share/rhn/lib/java-branding.jar wrapper.java.additional.1=-Dibm.dst.compatibility=true
# Initial Java Heap Size (in MB) -wrapper.java.initmemory=32 +wrapper.java.initmemory=256
# Maximum Java Heap Size (in MB) -wrapper.java.maxmemory=192 +wrapper.java.maxmemory=512
# Application parameters. Add parameters as needed starting from 1 #wrapper.app.parameter.1=<YourMainClass>
commit 0c4a13325f7790a6d6925516562833f34ac7e127 Author: Shannon Hughes shughes@redhat.com Date: Tue Jul 7 12:57:33 2009 -0400
fix prads oops
diff --git a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp index a1f8c67..4733121 100644 --- a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp @@ -96,7 +96,7 @@ <c:when test="${repo_status == true}"> <bean:message key="channel.jsp.repodata.inProgress"/> </c:when> - <c:when test="${repo_status == false && repo_last_build != null}> + <c:when test="${repo_status == false && repo_last_build != null}"> <bean:message key="channel.jsp.repodata.completed"/> </c:when> <c:otherwise>
commit e031fb579fd53010640fe54869a0cc294a677a5c Author: Pradeep Kilambi pkilambi@redhat.com Date: Tue Jul 7 12:56:33 2009 -0400
509911 - Dont compute date is the file is missing that way we dont show 1969 for last build. Also chnaging the jsp logic to only show as complete if both last build and status are not null
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index c9ebb5d..32ddadb 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -2770,6 +2770,10 @@ public class ChannelManager extends BaseManager { File theFile = new File(mountPoint + File.separator + pathPrefix + File.separator + channel.getLabel() + File.separator + "repomd.xml"); + if (!theFile.exists()) { + // No repo file, dont bother computing build date + return null; + } Date fileModifiedDateIn = new Date(theFile.lastModified()); // the file Modified date should be getting set when the file // is moved into the correct location. diff --git a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp index 64fe57f..a1f8c67 100644 --- a/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp +++ b/java/code/webapp/WEB-INF/pages/channel/channeldetail.jsp @@ -89,16 +89,19 @@ <tr> <th><bean:message key="channel.jsp.repodata"/>:</th> <td> - <c:if test="${repo_status == null}"> - <span class="no-details">(none)</span> - </c:if> <c:choose> + <c:when test="${repo_status == null}"> + <span class="no-details">(none)</span> + </c:when> <c:when test="${repo_status == true}"> <bean:message key="channel.jsp.repodata.inProgress"/> </c:when> - <c:otherwise> + <c:when test="${repo_status == false && repo_last_build != null}> <bean:message key="channel.jsp.repodata.completed"/> - </c:otherwise> + </c:when> + <c:otherwise> + <span class="no-details">(none)</span> + </c:otherwise> </c:choose> </td> </tr>
commit f9b2f6381698ee1f7efb1feae62064669ad6fc25 Author: Brad Buckingham bbuckingham@redhat.com Date: Tue Jul 7 11:34:30 2009 -0400
509394 - update System/Profile comparison to not display duplicate error messages
Scenario: 1. Systems->system->Software->Profiles-> compare to a profile --or-- Systems->system->Software->Profiles-> compare to a system 2. Select a 'sync' when no packages have been selected from the list... 3. User is sent back to the initial page from 1; however, they see the following error message 2 times: "There was no selection. Please make your selection and try again."
This commit will change the behavior to do a redirect back to the page in 1, so that the error message is not duplicated...
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java index dbf4ef8..c521f75 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java @@ -80,6 +80,11 @@ public class CompareProfileSetupAction extends RhnAction { } else { RhnHelper.handleEmptySelection(request); + Map params = new HashMap(); + params.put(RequestContext.SID, sid.toString()); + params.put(RequestContext.PRID, prid.toString()); + return getStrutsDelegate().forwardParams( + mapping.findForward("error"), params); } } DataResult dataSet = getDataResult(requestContext); diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java index 0479d70..d8cc04a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java @@ -76,6 +76,11 @@ public class CompareSystemSetupAction extends RhnAction { } else { RhnHelper.handleEmptySelection(request); + Map params = new HashMap(); + params.put(RequestContext.SID, sid.toString()); + params.put(RequestContext.SID1, sid1.toString()); + return getStrutsDelegate().forwardParams( + mapping.findForward("error"), params); } } DataResult dataSet = getDataResult(requestContext); diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 4f9d9ee..0ae2e38 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -3613,6 +3613,7 @@ <forward name="submit" path="/systems/details/packages/profiles/SyncProfiles.do" redirect="true" /> + <forward name="error" path="/systems/details/packages/profiles/CompareProfiles.do" redirect="true" /> </action>
<action path="/systems/details/packages/profiles/CompareProfilesSubmit" @@ -3638,6 +3639,7 @@ <forward name="submit" path="/systems/details/packages/profiles/SyncSystems.do" redirect="true" /> + <forward name="error" path="/systems/details/packages/profiles/CompareSystems.do" redirect="true" /> </action>
<action path="/systems/details/packages/profiles/CompareSystemsSubmit"
commit 032a81e2173b39dbd84524c305bab7b8e4309541 Author: Justin Sherrill jsherril@redhat.com Date: Tue Jul 7 10:44:29 2009 -0400
508980 - converting SSM kickstart to java
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml index 3b335d3..93a0da7 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml @@ -36,6 +36,24 @@ ORDER BY UPPER(NVL(S.name, '(none)')), S.id <elaborator name="system_overview" /> </mode>
+<!-- system_feature(ftr_kickstart); not is_solaris() --> +<mode name="ssm_kickstartable" class="com.redhat.rhn.frontend.dto.SystemOverview"> + <query params="user_id"> +SELECT S.id, + S.name + FROM rhnServer S + inner join rhnSet ST on S.id = ST.element + inner join rhnUserServerPerms USP on USP.server_id = S.id + WHERE USP.user_id = :user_id + AND ST.user_id = :user_id + AND ST.label = 'system_list' + AND EXISTS(SELECT 1 FROM rhnServerFeaturesView SFV WHERE SFV.server_id = ST.element AND SFV.label = 'ftr_kickstart') + AND USP.server_id = S.id +ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID + </query> + <elaborator name="system_overview" /> +</mode> +
<mode name="ssm_remote_commandable"> <query params="user_id"> diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java index b3569d9..8dd7d43 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java @@ -470,7 +470,7 @@ public class KickstartFactory extends HibernateFactory { * @param org who owns the Kickstart Range * @return List of Kickstart Ip Ranges if found */ - public static List lookupRangeByOrg(Org org) { + public static List<KickstartIpRange> lookupRangeByOrg(Org org) { Session session = null; session = HibernateFactory.getSession(); return session.getNamedQuery("KickstartIpRange.lookupByOrg") diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java index 89a6780..1354a96 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Server.java +++ b/java/code/src/com/redhat/rhn/domain/server/Server.java @@ -730,7 +730,7 @@ public class Server extends BaseDomainHelper implements Identifiable { /** * @return Returns the networks */ - public Set getNetworks() { + public Set<Network> getNetworks() { return networks; }
@@ -1686,4 +1686,20 @@ public class Server extends BaseDomainHelper implements Identifiable { public void setIgnoreEntitlementsForMigration(Boolean ignoreIn) { this.ignoreEntitlementsForMigration = ignoreIn; } + + /** + * Get the NetworkInteface with the given name (i.e. eth0) + * @param ifName the interface name (i.e. eth0) + * @return the NetworkInterface, otherwise null + */ + public NetworkInterface getNetworkInterface(String ifName) { + for (NetworkInterface nic : getNetworkInterfaces()) { + if (nic.getName().equals(ifName)) { + return nic; + } + } + return null; + } + + } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java index e30ead3..a5fd5e7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java @@ -15,9 +15,6 @@ package com.redhat.rhn.frontend.action.kickstart;
import com.redhat.rhn.common.conf.ConfigDefaults; -import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.common.db.datasource.ModeFactory; -import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.security.SessionSwap; import com.redhat.rhn.domain.channel.Channel; @@ -26,11 +23,10 @@ import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.dto.kickstart.KickstartIpRangeDto; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.kickstart.IpAddress; -import com.redhat.rhn.manager.kickstart.IpAddressRange; import com.redhat.rhn.manager.kickstart.KickstartFormatter; +import com.redhat.rhn.manager.kickstart.KickstartManager; import com.redhat.rhn.manager.kickstart.KickstartSessionCreateCommand; import com.redhat.rhn.manager.kickstart.KickstartSessionUpdateCommand;
@@ -172,7 +168,8 @@ public class KickstartHelper { else if (mode.equals(IP_RANGE)) { log.debug("Ip_range mode"); IpAddress clientIp = new IpAddress(remoteAddr); - ksdata = findBestFitProfile(clientIp, org); + ksdata = KickstartManager.getInstance().findProfileForIpAddress( + clientIp, org); } else if (mode.equals(ORG_DEFAULT)) { //process org_default @@ -241,42 +238,6 @@ public class KickstartHelper { return remoteAddr; }
- /** - * Finds the profile which is a best fit. - * @param clientIpIn IpAddress to search ip ranges for - * @param orgIn Org coming in from the url - * @return best KickstartData Profile - */ - protected KickstartData findBestFitProfile(IpAddress clientIpIn, Org orgIn) { - DataResult ipRanges = null; - SelectMode mode = ModeFactory.getMode("General_queries", - "org_ks_ip_ranges_for_ip"); - Map params = new HashMap(); - params.put("org_id", orgIn.getId().toString()); - params.put("ip", clientIpIn.getLongNumber().toString()); - ipRanges = mode.execute(params); - - IpAddressRange bestRange = null; - - log.debug("ipranges.size: " + ipRanges.size()); - - // find innermost range and return profile - for (Iterator itr = ipRanges.iterator(); itr.hasNext();) { - KickstartIpRangeDto range = (KickstartIpRangeDto)itr.next(); - IpAddressRange iprange = new IpAddressRange(range.getMin().longValue(), - range.getMax().longValue(), - range.getId().longValue()); - //seed range if null - bestRange = (bestRange == null) ? iprange : bestRange; - if (iprange.isSubset(bestRange)) { - log.debug("found a range"); - bestRange = iprange; - } - } - - return (bestRange == null) ? getOrgDefaultProfile(orgIn) : - KickstartFactory.lookupKickstartDataByIdAndOrg(orgIn, bestRange.getKsid()); - }
/** * 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 1524c6e..3f3f524 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 @@ -38,19 +38,19 @@ import com.redhat.rhn.manager.kickstart.cobbler.CobblerSystemCreateCommand; import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; import com.redhat.rhn.manager.system.SystemManager;
-import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.DynaActionForm; +import org.apache.struts.util.LabelValueBean; import org.cobbler.CobblerConnection; +import org.cobbler.CobblerObject; import org.cobbler.Distro; import org.cobbler.SystemRecord;
import java.lang.reflect.Method; -import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.Iterator; @@ -58,6 +58,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map;
+import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse;
/** @@ -74,7 +75,6 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { .getLogger(ScheduleKickstartWizardAction.class);
public static final String SYNCH_PACKAGES = "syncPackages"; - public static final String ACTIVATION_KEYS = "activationKeys"; public static final String SYNCH_SYSTEMS = "syncSystems"; public static final String HAS_PROFILES = "hasProfiles"; public static final String HAS_PROXIES = "hasProxies"; @@ -86,16 +86,13 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { public static final String KERNEL_PARAMS_DISTRO = "distro"; public static final String KERNEL_PARAMS_PROFILE = "profile"; public static final String KERNEL_PARAMS_CUSTOM = "custom"; - + private static final String COBBLER_ONLY_PROFILE = "cobblerOnlyProfile"; public static final String POST_KERNEL_PARAMS = "postKernelParams"; public static final String POST_KERNEL_PARAMS_TYPE = "postKernelParamsType"; public static final String PROXY_HOST = "proxyHost"; - public static final String USE_EXISTING_PROFILE = "useExistingProfile"; - public static final String ACTIVATION_KEY = "activationKey"; public static final String IS_VIRTUAL_GUEST = "isVirtualGuest"; public static final String HOST_SID = "hostSid"; public static final String VIRT_HOST_IS_REGISTERED = "virtHostIsRegistered"; - public static final String TARGET_PROFILE_TYPE = "targetProfileType"; /** * {@inheritDoc} @@ -149,25 +146,33 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { } return profiles; } - }
- private List getProxies(KickstartScheduleCommand cmd) { - List proxies = cmd.getProxies(); - if (proxies == null) { - return Collections.EMPTY_LIST; - } - - List formatted = new LinkedList();
- formatted.add(lvl10n("kickstart.schedule.default.proxy.jsp", "")); - for (Iterator itr = proxies.iterator(); itr.hasNext();) { - OrgProxyServer serv = (OrgProxyServer) itr.next(); + /** + * Sets up the proxy information for the wizard. + * its public in this class because we reuse this in SSM + * and only this class knows how to format the name nicely. + * @param ctx the request context needed for user info and + * things to bind to the request + */ + public static void setupProxyInfo(RequestContext ctx) { + List<OrgProxyServer> proxies = SystemManager. + listProxies(ctx.getLoggedInUser().getOrg()); + if (proxies != null && proxies.size() > 0) { + List<LabelValueBean> formatted = new LinkedList<LabelValueBean>();
- formatted.add(lv(serv.getName() + " (" + serv.getCheckin() + ")", - serv.getId().toString())); + formatted.add(lvl10n("kickstart.schedule.default.proxy.jsp", "")); + for (OrgProxyServer serv : proxies) { + formatted.add(lv(serv.getName() + " (" + serv.getCheckin() + ")", + serv.getId().toString())); + } + ctx.getRequest().setAttribute(HAS_PROXIES, Boolean.TRUE.toString()); + ctx.getRequest().setAttribute(PROXIES, formatted); + } + else { + ctx.getRequest().setAttribute(HAS_PROXIES, Boolean.FALSE.toString()); } - return formatted; }
/** @@ -212,26 +217,15 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction {
addRequestAttributes(ctx, cmd, form); checkForKickstart(form, cmd, ctx); - List proxies = getProxies(cmd); - if (proxies != null && proxies.size() > 0) { - ctx.getRequest().setAttribute(HAS_PROXIES, Boolean.TRUE.toString()); - ctx.getRequest().setAttribute(PROXIES, proxies); - if (form.get(PROXY_HOST) == null) { - form.set(PROXY_HOST, ""); - } - } - else { - ctx.getRequest() - .setAttribute(HAS_PROXIES, Boolean.FALSE.toString()); + setupProxyInfo(ctx); + if (StringUtils.isBlank(form.getString(PROXY_HOST))) { + form.set(PROXY_HOST, ""); } - // create and prepopulate the date picker. - DatePicker picker = getStrutsDelegate().prepopulateDatePicker( + getStrutsDelegate().prepopulateDatePicker( ctx.getRequest(), form, "date", DatePicker.YEAR_RANGE_POSITIVE);
SdcHelper.ssmCheck(ctx.getRequest(), system.getId(), user); - ctx.getRequest().setAttribute("date", picker); - Map params = new HashMap<String, String>(); params.put(RequestContext.SID, sid); ListHelper helper = new ListHelper(new Profiles(), ctx.getRequest(), @@ -271,33 +265,33 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction {
checkForKickstart(form, cmd, ctx); addRequestAttributes(ctx, cmd, form); - form.set(ACTIVATION_KEYS, cmd.getActivationKeys()); - DataResult packageProfiles = cmd.getProfiles(); - form.set(SYNCH_PACKAGES, packageProfiles); - DataResult systemProfiles = cmd.getCompatibleSystems(); - form.set(SYNCH_SYSTEMS, systemProfiles); - - // Disable the package/system sync radio buttons if no profiles are - // available: - String syncPackageDisabled = "false"; - if (packageProfiles.size() == 0) { - syncPackageDisabled = "true"; - } - String syncSystemDisabled = "false"; - if (systemProfiles.size() == 0) { - syncSystemDisabled = "true"; - } - ctx.getRequest() - .setAttribute(SYNC_PACKAGE_DISABED, syncPackageDisabled); - ctx.getRequest().setAttribute(SYNC_SYSTEM_DISABLED, syncSystemDisabled); + if (!cmd.isCobblerOnly()) { + List packageProfiles = cmd.getProfiles(); + form.set(SYNCH_PACKAGES, packageProfiles); + List systemProfiles = cmd.getCompatibleSystems(); + form.set(SYNCH_SYSTEMS, systemProfiles); + + // Disable the package/system sync radio buttons if no profiles are + // available: + String syncPackageDisabled = "false"; + if (packageProfiles.size() == 0) { + syncPackageDisabled = "true"; + } + String syncSystemDisabled = "false"; + if (systemProfiles.size() == 0) { + syncSystemDisabled = "true"; + } + ctx.getRequest() + .setAttribute(SYNC_PACKAGE_DISABED, syncPackageDisabled); + ctx.getRequest().setAttribute(SYNC_SYSTEM_DISABLED, syncSystemDisabled);
- if (StringUtils.isEmpty(form.getString(USE_EXISTING_PROFILE))) { - form.set(USE_EXISTING_PROFILE, Boolean.TRUE.toString()); + if (StringUtils.isEmpty(form.getString(TARGET_PROFILE_TYPE))) { + form.set(TARGET_PROFILE_TYPE, + KickstartScheduleCommand.TARGET_PROFILE_TYPE_NONE); + } } - - if (StringUtils.isEmpty(form.getString(TARGET_PROFILE_TYPE))) { - form.set(TARGET_PROFILE_TYPE, - KickstartScheduleCommand.TARGET_PROFILE_TYPE_EXISTING); + else { + ctx.getRequest().setAttribute(COBBLER_ONLY_PROFILE, Boolean.TRUE); }
if (StringUtils.isEmpty(form.getString(KERNEL_PARAMS_TYPE))) { @@ -386,59 +380,12 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { KickstartHelper helper = new KickstartHelper(ctx.getRequest()); KickstartScheduleCommand cmd = getScheduleCommand(form, ctx, scheduleTime, helper.getKickstartHost()); - - CobblerConnection con = CobblerXMLRPCHelper. - getConnection(ctx.getLoggedInUser()); - - String type = form.getString(KERNEL_PARAMS_TYPE); - if (KERNEL_PARAMS_CUSTOM.equals(type)) { - cmd.setKernelOptions(form.getString(KERNEL_PARAMS)); - } - else if (KERNEL_PARAMS_DISTRO.equals(type)) { - Distro distro = Distro. - lookupById(con, cmd.getKsdata().getTree().getCobblerId()); - cmd.setKernelOptions(distro.getKernelOptionsString()); - } - else { - org.cobbler.Profile profile = org.cobbler.Profile. - lookupById(con, cmd.getKsdata().getCobblerId()); - cmd.setKernelOptions(profile.getKernelOptionsString()); - } - - type = form.getString(POST_KERNEL_PARAMS_TYPE); - if (KERNEL_PARAMS_CUSTOM.equals(type)) { - cmd.setPostKernelOptions(form.getString(POST_KERNEL_PARAMS)); - } - else if (KERNEL_PARAMS_DISTRO.equals(type)) { - Distro distro = Distro. - lookupById(con, cmd.getKsdata().getTree().getCobblerId()); - cmd.setPostKernelOptions(distro.getKernelPostOptionsString()); - } - else { - org.cobbler.Profile profile = org.cobbler.Profile. - lookupById(con, cmd.getKsdata().getCobblerId()); - cmd.setPostKernelOptions(profile.getKernelPostOptionsString()); - } - - - boolean advancedConfig = false; - // if existing profile is not set then actions froms from normal config - // page - if (StringUtils.isEmpty(form.getString(USE_EXISTING_PROFILE))) { - form.set(USE_EXISTING_PROFILE, Boolean.TRUE.toString()); - } - else { - advancedConfig = true; - }
- if (BooleanUtils.toBoolean(form.getString(USE_EXISTING_PROFILE))) { - cmd - .setActivationType(KickstartScheduleCommand.ACTIVATION_TYPE_EXISTING); - } - else { - cmd.setActivationType(KickstartScheduleCommand.ACTIVATION_TYPE_KEY); - cmd.setActivationKeyId((Long) form.get(ACTIVATION_KEY)); - } + cmd.setKernelOptions(parseKernelOptions(form, ctx.getRequest(), + form.getString(RequestContext.COBBLER_ID), false)); + cmd.setPostKernelOptions(parseKernelOptions(form, ctx.getRequest(), + form.getString(RequestContext.COBBLER_ID), true)); + if (!cmd.isCobblerOnly()) { // now setup system/package profiles for kickstart to sync Profile pkgProfile = cmd.getKsdata().getKickstartDefaults() @@ -447,7 +394,7 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction {
// if user did not override package profile, then grab from ks // profile if avail - if (!advancedConfig && packageProfileId != null) { + if (packageProfileId != null) { cmd.setProfileId(packageProfileId); cmd.setProfileType(KickstartScheduleCommand.TARGET_PROFILE_TYPE_PACKAGE); } @@ -625,4 +572,68 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { return new KickstartScheduleCommand(sid, currentUser); }
+ /** + * Parses the kernel options or Post kernel options + * from the given form. Called after the advanced options page + * is typically set.. + * This is a handy method used in both SSM and SDC KS scheduling. + * @param form the kickstartScheduleWizardForm that holds the form fields. + * @param request the servlet request + * @param profileCobblerId the cobbler profile id + * @param isPost true if caller is interested in getting the + * post kernel options and not the pre. + * @return the kernel options selected by the user. + */ + public static String parseKernelOptions(DynaActionForm form, + HttpServletRequest request, + String profileCobblerId, + boolean isPost) { + RequestContext context = new RequestContext(request); + String typeKey = !isPost ? KERNEL_PARAMS_TYPE : POST_KERNEL_PARAMS_TYPE; + String customKey = !isPost ? KERNEL_PARAMS : POST_KERNEL_PARAMS; + String type = form.getString(typeKey); + + return parseKernelOptions(form.getString(customKey), type, profileCobblerId, + isPost, context.getCurrentUser()); + } + + + /** + * Parses the kernel options or Post kernel options + * from the given set of params + * This is a handy method used in both SSM and SDC KS scheduling. + * @param customOptions the kickstartScheduleWizardForm that holds the form fields. + * @param paramsType either KERNEL_PARAMS_CUSTOM _DISTRO or _PROFILE + * @param cobblerId the cobbler profile id + * @param isPost true if caller is interested in getting the + * post kernel options and not the pre. + * @param user the user doing the request + * @return the kernel options selected by the user. + */ + public static String parseKernelOptions(String customOptions, + String paramsType, + String cobblerId, + boolean isPost, User user) { + + CobblerConnection con = CobblerXMLRPCHelper. + getConnection(user); + if (KERNEL_PARAMS_CUSTOM.equals(paramsType)) { + return customOptions; + } + org.cobbler.Profile profile = org.cobbler.Profile.lookupById(con, + cobblerId); + CobblerObject ret = profile; + + if (KERNEL_PARAMS_DISTRO.equals(paramsType)) { + ret = profile.getDistro(); + } + if (!isPost) { + return ret.getKernelOptionsString(); + } + else { + return ret.getKernelPostOptionsString(); + } + + } + } 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 new file mode 100644 index 0000000..dff1085 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKSScheduleAction.java @@ -0,0 +1,187 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.action.kickstart.ssm; + +import com.redhat.rhn.common.util.DatePicker; +import com.redhat.rhn.common.validator.ValidatorError; +import com.redhat.rhn.domain.action.Action; +import com.redhat.rhn.domain.kickstart.KickstartData; +import com.redhat.rhn.domain.kickstart.KickstartFactory; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.server.ServerFactory; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.action.kickstart.ScheduleKickstartWizardAction; +import com.redhat.rhn.frontend.dto.SystemOverview; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; +import com.redhat.rhn.manager.kickstart.KickstartLister; +import com.redhat.rhn.manager.kickstart.KickstartManager; +import com.redhat.rhn.manager.kickstart.SSMScheduleCommand; +import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; +import com.redhat.rhn.manager.profile.ProfileManager; + +import org.apache.commons.lang.StringUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.action.DynaActionForm; +import org.cobbler.Profile; + +import java.util.Collections; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + +/** + * ScheduleKickstartAction + * @version $Rev$ + */ +public class SsmKSScheduleAction extends RhnAction implements Listable { + private static final String SCHEDULE_TYPE_IP = "isIP"; + + private boolean isIP(HttpServletRequest request) { + return Boolean.TRUE.equals(request.getAttribute(SCHEDULE_TYPE_IP)); + } + + /** + * ${@inheritDoc} + */ + public ActionForward execute(ActionMapping mapping, ActionForm formIn, + HttpServletRequest request, HttpServletResponse response) throws Exception { + RequestContext context = new RequestContext(request); + User user = context.getLoggedInUser(); + DynaActionForm form = (DynaActionForm)formIn; + if ("ip".equals(mapping.getParameter())) { + request.setAttribute(SCHEDULE_TYPE_IP, Boolean.TRUE); + } + + if (context.wasDispatched("kickstart.schedule.button2.jsp")) { + List list = schedule(request, form, context); + + ActionMessages msg = new ActionMessages(); + String[] params = {list.size() + ""}; + msg.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("ssm.provision.scheduled", + params)); + getStrutsDelegate().saveMessages(context.getRequest(), msg); + return mapping.findForward("success"); + } + + ListHelper helper = new ListHelper(this, request); + helper.execute(); + ScheduleKickstartWizardAction.setupProxyInfo(context); + form.set(ScheduleKickstartWizardAction.SYNCH_PACKAGES, + ProfileManager.listProfileOverviews(user.getOrg().getId())); + // create and prepopulate the date picker. + getStrutsDelegate().prepopulateDatePicker( + request, form, "date", DatePicker.YEAR_RANGE_POSITIVE); + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); + } + + + private List<Action> schedule(HttpServletRequest request, ActionForm form, + RequestContext context) { + SSMScheduleCommand com = null; + User user = context.getLoggedInUser(); + + + DynaActionForm dynaForm = (DynaActionForm) form; + DatePicker picker = getStrutsDelegate().prepopulateDatePicker(context.getRequest(), + dynaForm, "date", DatePicker.YEAR_RANGE_POSITIVE); + + List<SystemOverview> systems = + KickstartManager.getInstance().kickstartableSystemsInSsm(user); + + if (isIP(request)) { + com = SSMScheduleCommand.initIPKickstart(user, + systems, picker.getDate()); + } + else { + ListHelper helper = new ListHelper(this, request); + String cobblerId = ListTagHelper.getRadioSelection(helper.getListName(), + request); + KickstartData data = KickstartFactory.lookupKickstartDataByCobblerIdAndOrg( + user.getOrg(), cobblerId); + if (data == null) { + Profile prof = Profile.lookupById(CobblerXMLRPCHelper.getConnection(user), + cobblerId); + com = SSMScheduleCommand.initCobblerOnly(user, systems, + picker.getDate(), prof.getName()); + } + else { + com = SSMScheduleCommand.init(user, systems, picker.getDate(), data); + } + } + + + String proxyId = (String) dynaForm.getString( + ScheduleKickstartWizardAction.PROXY_HOST); + if (!StringUtils.isEmpty(proxyId)) { + Server proxy = ServerFactory.lookupById(Long.parseLong(proxyId)); + com.setProxy(proxy); + } + com.setProfileType(dynaForm.getString( + ScheduleKickstartWizardAction.TARGET_PROFILE_TYPE)); + com.setServerProfileId((Long) dynaForm.get("targetProfile")); + com.setPackageProfileId((Long) dynaForm.get("targetProfile")); + + //do kernel params + com.setKernelParamType(dynaForm.getString( + ScheduleKickstartWizardAction.KERNEL_PARAMS_TYPE)); + com.setCustomKernelParams(dynaForm.getString( + ScheduleKickstartWizardAction.KERNEL_PARAMS)); + + //do post kernel params + com.setPostKernelParamType(dynaForm.getString( + ScheduleKickstartWizardAction.POST_KERNEL_PARAMS_TYPE)); + com.setCustomPostKernelParams(dynaForm.getString( + ScheduleKickstartWizardAction.POST_KERNEL_PARAMS)); + + List<ValidatorError> errors = com.store(); + return com.getScheduledActions(); + } + + + /** + * {@inheritDoc} + */ + public List getResult(RequestContext ctx) { + + if (isIP(ctx.getRequest())) { + return Collections.EMPTY_LIST; + } + + User user = ctx.getLoggedInUser(); + List profiles = KickstartLister.getInstance().listProfilesForSsm(user); + + if (profiles.isEmpty()) { + addMessage(ctx.getRequest(), "kickstart.schedule.noprofiles"); + } + else { + ctx.getRequest().setAttribute(ScheduleKickstartWizardAction.HAS_PROFILES, + Boolean.TRUE); + } + return profiles; + } + +} 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 new file mode 100644 index 0000000..79c87ff --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ssm/SsmKickstartableSystemsAction.java @@ -0,0 +1,87 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.frontend.action.kickstart.ssm; + +import com.redhat.rhn.domain.kickstart.KickstartIpRange; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; +import com.redhat.rhn.manager.kickstart.KickstartLister; +import com.redhat.rhn.manager.kickstart.KickstartManager; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + + +/** + * SsmKickstartableSystemsAction + * @version $Rev$ + */ +public class SsmKickstartableSystemsAction extends RhnAction implements Listable { + private static final String DISABLE_RANGES = "disableRanges"; + private static final String DISABLE_PROFILES = "disableProfiles"; + private static final String DISABLE_SYSTEMS = "disableSystems"; + /** + * ${@inheritDoc} + */ + public ActionForward execute(ActionMapping mapping, ActionForm form, + HttpServletRequest request, HttpServletResponse response) throws Exception { + RequestContext context = new RequestContext(request); + if (context.wasDispatched("ssm.config.subscribe.jsp.continue")) { + if (Boolean.TRUE.toString().equals(request.getParameter("scheduleManual"))) { + return mapping.findForward("scheduleByProfile"); + } + return mapping.findForward("scheduleByIp"); + } + + ListHelper helper = new ListHelper(this, request); + helper.execute(); + + List <KickstartIpRange> range = KickstartManager.getInstance(). + listIpRanges(context.getLoggedInUser()); + if (range.isEmpty()) { + request.setAttribute(DISABLE_RANGES, Boolean.TRUE); + } + List profiles = KickstartLister.getInstance(). + listProfilesForSsm(context.getLoggedInUser()); + + if (profiles.isEmpty()) { + request.setAttribute(DISABLE_PROFILES, Boolean.TRUE); + + } + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); + } + + /** + * ${@inheritDoc} + */ + public List getResult(RequestContext context) { + User user = context.getLoggedInUser(); + List ret = KickstartManager.getInstance().kickstartableSystemsInSsm(user); + if (ret.isEmpty()) { + context.getRequest().setAttribute(DISABLE_SYSTEMS, Boolean.TRUE); + } + return ret; + } +} diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java index 13b45a5..79fddec 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java @@ -36,13 +36,13 @@ import com.redhat.rhn.domain.token.TokenFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.kickstart.ScheduleKickstartWizardAction; import com.redhat.rhn.frontend.context.Context; -import com.redhat.rhn.frontend.dto.ActivationKeyDto; import com.redhat.rhn.frontend.dto.ProfileDto; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.kickstart.KickstartLister; import com.redhat.rhn.manager.kickstart.KickstartScheduleCommand; import com.redhat.rhn.manager.profile.test.ProfileManagerTest; import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest; +import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.testing.RhnMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils;
@@ -106,8 +106,7 @@ public class ScheduleKickstartWizardTest extends RhnMockStrutsTestCase { proxy.addNetwork(NetworkTest.createNetworkInstance()); ServerFactory.save(proxy); TestUtils.flushAndEvict(proxy); - KickstartScheduleCommand cmd = new KickstartScheduleCommand(s.getId(), user); - assertTrue(cmd.getProxies().size() == 1); + assertTrue(SystemManager.listProxies(user.getOrg()).size() == 1); return proxy; }
@@ -165,8 +164,6 @@ public class ScheduleKickstartWizardTest extends RhnMockStrutsTestCase { assertNotNull(request.getAttribute(RequestContext.SYSTEM)); verifyFormList(ScheduleKickstartWizardAction.SYNCH_PACKAGES, ProfileDto.class); - verifyFormList(ScheduleKickstartWizardAction.ACTIVATION_KEYS, - ActivationKeyDto.class); verifyFormList(ScheduleKickstartWizardAction.SYNCH_SYSTEMS, HashMap.class); } 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 eaaf417..3e5ad9d 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 @@ -28,7 +28,6 @@ import com.redhat.rhn.manager.kickstart.KickstartScheduleCommand; import com.redhat.rhn.manager.kickstart.ProvisionVirtualInstanceCommand; import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
-import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForward; @@ -156,22 +155,6 @@ public class ProvisionVirtualizationWizardAction extends ScheduleKickstartWizard ProvisionVirtualInstanceCommand cmd = getScheduleCommand(form, ctx, scheduleTime, helper.getKickstartHost());
- if (StringUtils.isEmpty(form.getString(USE_EXISTING_PROFILE))) { - form.set(USE_EXISTING_PROFILE, Boolean.TRUE.toString()); - } - - boolean useExistingProfile = - BooleanUtils.toBoolean(form.getString(USE_EXISTING_PROFILE)); - if (useExistingProfile) { - cmd.setActivationType( - KickstartScheduleCommand.ACTIVATION_TYPE_EXISTING); - } - else { - cmd.setActivationType( - KickstartScheduleCommand.ACTIVATION_TYPE_KEY); - cmd.setActivationKeyId((Long) form.get(ACTIVATION_KEY)); - } - cmd.setKernelOptions(form.getString(KERNEL_PARAMS));
cmd.setProfileType(form.getString("targetProfileType")); diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java index 29be895..9e33c5a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java @@ -32,7 +32,6 @@ import com.redhat.rhn.domain.token.TokenFactory; import com.redhat.rhn.frontend.action.kickstart.ScheduleKickstartWizardAction; import com.redhat.rhn.frontend.action.kickstart.test.ScheduleKickstartWizardTest; import com.redhat.rhn.frontend.action.systems.virtualization.ProvisionVirtualizationWizardAction; -import com.redhat.rhn.frontend.dto.ActivationKeyDto; import com.redhat.rhn.frontend.dto.ProfileDto; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.kickstart.KickstartScheduleCommand; @@ -120,8 +119,6 @@ public class ProvisionVirtualizationWizardActionTest extends RhnMockStrutsTestCa assertNotNull(request.getAttribute(RequestContext.SYSTEM)); verifyFormList(ScheduleKickstartWizardAction.SYNCH_PACKAGES, ProfileDto.class); - verifyFormList(ScheduleKickstartWizardAction.ACTIVATION_KEYS, - ActivationKeyDto.class); verifyFormList(ScheduleKickstartWizardAction.SYNCH_SYSTEMS, HashMap.class);
@@ -179,8 +176,6 @@ public class ProvisionVirtualizationWizardActionTest extends RhnMockStrutsTestCa "/systems/details/kickstart/SessionStatus.do?sid=" + s.getId());
assertNotNull(KickstartFactory.lookupKickstartSessionByServer(s.getId())); - verifyFormValue("useExistingProfile", Boolean.TRUE.toString()); - if (addProxy && proxy != null) { verifyFormValue(ScheduleKickstartWizardAction.PROXY_HOST, proxy.getId().toString()); diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 32fafc1..8b3cd0c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -8259,6 +8259,9 @@ Follow this url to see the full list of inactive systems: <trans-unit id="snapshots.configchannel"> <source>Configuration Channels Updated</source> </trans-unit> + <trans-unit id="ssm.provision.scheduled"> + <source>Successfully scheduled {0} system(s) for provisioning.</source> + </trans-unit> <trans-unit id="kickstart.cobbler.distro.syncfail"> <source> The following is a list of errors gathered while Spacewalk attempts to 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 9044f24..21a817e 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 @@ -9111,6 +9111,57 @@ Please note that some manual configuration of these scripts may still be require </context-group> </trans-unit>
+ <!-- SSM Kickstart --> + <group> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/ssm/kickstart/KickstartableSystems.do</context> + </context-group> + <trans-unit id="ssm.kickstartable-systems.jsp.title"> + <source>Kickstartable Systems</source> + </trans-unit> + <trans-unit id="ssm.kickstartable-systems.jsp.summary"> + <source>Below are the systems in you selected systems list that are kickstartable using @@PRODUCT_NAME@@.</source> + </trans-unit> + <trans-unit id="ssm.kickstartable-systems.jsp.systems"> + <source>Kickstart Selected Systems</source> + </trans-unit> + <trans-unit id="ssm.kickstartable-systems.jsp.systems.summary"> + <source>You may kickstart the selected systems.</source> + </trans-unit> + <trans-unit id="ssm.kickstartable-systems.jsp.type"> + <source>Kickstartable Type</source> + </trans-unit> + <trans-unit id="ssm.kickstartable-systems.jsp.manual-summary"> + <source>Select kickstart profile.</source> + </trans-unit> + <trans-unit id="ssm.kickstartable-systems.jsp.ip-summary"> + <source>Kickstart by IP Address.</source> + </trans-unit> + <trans-unit id="ssm.kickstartable-systems.jsp.ip-tooltip"> + <source>If there is no organization default profile specified for this organization, a kickstart will not get scheduled for systems that do not fall under an ip range.</source> + </trans-unit> + </group> + <group> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/ssm/kickstart/ScheduleByProfile.do</context> + <context context-type="sourcefile">/rhn/systems/ssm/kickstart/ScheduleByIp.do</context> + </context-group> + <trans-unit id="ssm.kickstart.schedule.heading1.text.jsp"> + <source> Schedule kickstart actions for the the selected systems. These actions will re-install the selected systems using the kickstart options specified.</source> + </trans-unit> + <trans-unit id="ssm.kickstart.schedule.heading2.text.jsp"> + <source>Please select the kickstart profile you'd like to use to kickstart the selected systems.</source> + </trans-unit> + <trans-unit id="ssm.kickstart.schedule.ip.heading2.text.jsp"> + <source>The kickstart profile will be automatically selected for each system based upon its network configuration. If no match is found, the organizational default profile will be used if set.</source> + </trans-unit> + <trans-unit id="ssm.kickstart.schedule.proxy.jsp.summary"> + <source>You may choose to use an @@PRODUCT_NAME@@ Proxy to access the files necessary for kickstart. The selected systems will be registered to the @@PRODUCT_NAME@@ Proxy selected below after its kickstart has completed..</source> + </trans-unit> + <trans-unit id="ssm.kickstart.distro.cobbler-only.tooltip"> + <source> Profiles that are not @@PRODUCT_NAME@@-managed are not guaranteed to register systems to @@PRODUCT_NAME@@ after kickstart. You may wish to review these kickstarts (click on the profile name to do so) to confirm whether or not the selected systems will reappear in the @@PRODUCT_NAME@@ system list after kickstart.</source> + </trans-unit> + </group> <!-- Kickstart -->
<trans-unit id="partitions"> @@ -16430,10 +16481,10 @@ the <a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}">Acti <source>Bootloader</source> </trans-unit> <trans-unit id="kickstart.schedule.kernel.options.distro"> - <source><strong>As specified by Kickstart Distribution</strong>({0})</source> + <source><strong>As specified by Kickstart Distribution</strong></source> </trans-unit> <trans-unit id="kickstart.schedule.kernel.options.profile"> - <source><strong>As specified by Kickstart Profile</strong>({0})</source> + <source><strong>As specified by Kickstart Profile</strong></source> </trans-unit> <trans-unit id="kickstart.schedule.kernel.options.custom.tip"> <source>If you would not like any kernel options, select '{0}' and leave the form field blank.</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml index 4a3c858..eaef6fb 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml @@ -636,7 +636,14 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" <context-group name="ctx"> <context context-type="sourcefile">Navigation Menu</context> </context-group> - </trans-unit> + </trans-unit> + + <trans-unit id="Tag Systems"> +<source>Tag Systems</source> + <context-group name="ctx"> + <context context-type="sourcefile">Navigation Menu</context> + </context-group> + </trans-unit>
<trans-unit id="Reactivation"> <source>Reactivation</source> diff --git a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java index c1eb7d3..96336af 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java @@ -357,6 +357,7 @@ public class StrutsDelegate { else if (form.getMap().containsKey(DatePicker.USE_DATE)) { form.set(DatePicker.USE_DATE, Boolean.FALSE); } + request.setAttribute(name, p); //give back the date picker return p; } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index e49b812..df6153e 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -1968,7 +1968,7 @@ public class SystemHandler extends BaseHandler { throw new FaultException(-2, "provisionError", LocalizationService.getInstance().getMessage(ve.getKey())); } - return cmd.getKickstartActionId().intValue(); + return cmd.getScheduledAction().getId().intValue(); }
/** @@ -2021,7 +2021,7 @@ public class SystemHandler extends BaseHandler { throw new FaultException(-2, "provisionError", LocalizationService.getInstance().getMessage(ve.getKey())); } - return cmd.getKickstartActionId().intValue(); + return cmd.getScheduledAction().getId().intValue(); }
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java index f91f43f..854956a 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java @@ -414,4 +414,20 @@ public class KickstartLister extends BaseManager { } } } + + /** + * Returns a list of all the kickstart profiles + * available to the user + * Spacewalk Managed + Cobbler Only profiles + * @param user the user object needed to get access to cobbler + * @return a list of cobbler profiles or empty list. + */ + public List <KickstartDto> listProfilesForSsm(User user) { + List <KickstartDto> ret = new LinkedList<KickstartDto>(); + ret.addAll(kickstartsInOrg(user.getOrg(), null)); + ret.addAll(listCobblerProfiles(user)); + setKickstartUrls(ret, user); + return ret; + } + } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java index 574bb0e..bccc6ba 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java @@ -15,12 +15,29 @@ package com.redhat.rhn.manager.kickstart;
import com.redhat.rhn.common.conf.ConfigDefaults; +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.db.datasource.ModeFactory; +import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.common.util.download.DownloadException; import com.redhat.rhn.common.util.download.DownloadUtils; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.kickstart.KickstartData; +import com.redhat.rhn.domain.kickstart.KickstartFactory; +import com.redhat.rhn.domain.kickstart.KickstartIpRange; +import com.redhat.rhn.domain.org.Org; +import com.redhat.rhn.domain.server.NetworkInterface; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.dto.SystemOverview; +import com.redhat.rhn.frontend.dto.kickstart.KickstartIpRangeDto; import com.redhat.rhn.manager.BaseManager;
+import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + /** * * KickstartManager @@ -81,5 +98,102 @@ public class KickstartManager extends BaseManager { ValidatorException.raiseException("kickstart.jsp.error.template_generation", KickstartUrlHelper.getFileDowloadPageUrl(ksdata)); } - } + } + + /** + * returns a list of systems in SSM + * that are kickstartable + * @param user the user for access info + * @return the list of kickstartable systems + */ + public DataResult<SystemOverview> kickstartableSystemsInSsm(User user) { + SelectMode m = ModeFactory.getMode("System_queries", "ssm_kickstartable"); + Map params = new HashMap(); + params.put("user_id", user.getId()); + return makeDataResult(params, Collections.EMPTY_MAP, null, m); + } + + /** + * returns a list of IP ranges accessible to the + * user + * @param user the current user needed for org information + * @return the the list of ip ranges accessible to the user. + */ + public List<KickstartIpRange> listIpRanges(User user) { + return KickstartFactory.lookupRangeByOrg(user.getOrg()); + } + + /** + * Find a kickstart profile for a given server by searching by IP addresses + * @param server the server to find the ksdata for + * @return the kickstartData or 'null' if nothing found + */ + public KickstartData findProfileForServersNetwork(Server server) { + KickstartData ks = null; + /* + * So first get the IP address for eth0 and see if there's + * A kickstart that corresponds to it + */ + NetworkInterface nic = server.getNetworkInterface("eth0"); + if (nic != null && isPublicIpAddress(nic.getIpaddr())) { + IpAddress ip = new IpAddress(nic.getIpaddr()); + ks = findProfileForIpAddress(ip, server.getOrg()); + } + /* + * If there wasn't, then lets just take the first good ip address we can find + */ + if (ks == null) { + for (NetworkInterface tmp : server.getNetworkInterfaces()) { + if (isPublicIpAddress(tmp.getIpaddr())) { + IpAddress ip = new IpAddress(tmp.getIpaddr()); + ks = findProfileForIpAddress(ip, server.getOrg()); + if (ks != null) { + break; + } + } + } + } + return ks; + } + + private boolean isPublicIpAddress(String ip) { + return !(ip.equals("127.0.0.1") || ip.equals("0.0.0.0") || ip.equals("")); + } + + /** + * Finds the profile which is a best fit. + * @param clientIpIn IpAddress to search ip ranges for + * @param orgIn Org coming in from the url + * @return best KickstartData Profile + */ + public KickstartData findProfileForIpAddress(IpAddress clientIpIn, Org orgIn) { + DataResult ipRanges = null; + SelectMode mode = ModeFactory.getMode("General_queries", + "org_ks_ip_ranges_for_ip"); + Map params = new HashMap(); + params.put("org_id", orgIn.getId().toString()); + params.put("ip", clientIpIn.getLongNumber().toString()); + ipRanges = mode.execute(params); + + IpAddressRange bestRange = null; + + // find innermost range and return profile + for (Iterator itr = ipRanges.iterator(); itr.hasNext();) { + KickstartIpRangeDto range = (KickstartIpRangeDto)itr.next(); + IpAddressRange iprange = new IpAddressRange(range.getMin().longValue(), + range.getMax().longValue(), + range.getId().longValue()); + //seed range if null + bestRange = (bestRange == null) ? iprange : bestRange; + if (iprange.isSubset(bestRange)) { + bestRange = iprange; + } + } + + return (bestRange == null) ? KickstartFactory.lookupOrgDefault(orgIn) : + KickstartFactory.lookupKickstartDataByIdAndOrg(orgIn, bestRange.getKsid()); + } + + + } 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 434b8f2..c065812 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java @@ -44,6 +44,7 @@ import com.redhat.rhn.domain.token.ActivationKeyFactory; import com.redhat.rhn.domain.token.Token; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.PackageListItem; +import com.redhat.rhn.frontend.dto.ProfileDto; import com.redhat.rhn.frontend.dto.ServerPath; import com.redhat.rhn.frontend.dto.kickstart.CobblerProfileDto; import com.redhat.rhn.frontend.dto.kickstart.KickstartDto; @@ -128,9 +129,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation { private KickstartSession kickstartSession; private Date scheduleDate; private List packagesToInstall; - private String activationType; private String profileType; - private Set activationKeyIds; private String proxyHost; private Server targetServer;
@@ -151,7 +150,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation { // The server who serves the kickstarts private String kickstartServerName; // The id of the action scheduled to perform the kickstart - private Long kickstartActionId; + private Action scheduledAction;
/** * Constructor for a kickstart where the host and the target are the same system. @@ -301,36 +300,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
this.setKickstartServerName(kickstartServerNameIn); } - /** - * Creates the Kickstart Sechdule command that works with a cobbler only - * kickstart where the host and the target may or may *not* be - * the same system. If the target system does not yet exist, selectedTargetServer - * should be null. To be used when you want to call the store() method. - * - * @param selectedHostServer server to host the kickstart - * @param selectedTargetServer server to be kickstarted - * @param label cobbler only profile label. - * @param userIn user performing the kickstart - * @param scheduleDateIn Date to schedule the KS. - * @param kickstartServerNameIn the name of the server who is serving the kickstart - * @return the created cobbler only profile aware kickstartScheduleCommand - */ - public static KickstartScheduleCommand createCobblerScheduleCommand( - Long selectedHostServer, - Long selectedTargetServer, - String label, - User userIn, - Date scheduleDateIn, - String kickstartServerNameIn) { - - KickstartScheduleCommand cmd = new KickstartScheduleCommand(selectedHostServer, - selectedTargetServer, (KickstartData)null, - userIn, scheduleDateIn, kickstartServerNameIn); - cmd.cobblerProfileLabel = label; - cmd.cobblerOnly = true; - return cmd; - - } +
/** * Creates the Kickstart Sechdule command that works with a cobbler only @@ -350,8 +320,12 @@ public class KickstartScheduleCommand extends BaseSystemOperation { User userIn, Date scheduleDateIn, String kickstartServerNameIn) { - return createCobblerScheduleCommand(selectedHostServer, selectedHostServer, label, - userIn, scheduleDateIn, kickstartServerNameIn); + KickstartScheduleCommand cmd = new KickstartScheduleCommand(selectedHostServer, + selectedHostServer, (KickstartData)null, + userIn, scheduleDateIn, kickstartServerNameIn); + cmd.cobblerProfileLabel = label; + cmd.cobblerOnly = true; + return cmd; }
@@ -361,8 +335,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
log.debug("Initializing with selectedHostServerId=" + selectedHostServerId + ", selectedTargetServerId=" + selectedTargetServerId); - - this.setActivationType(ACTIVATION_TYPE_EXISTING); this.setPackagesToInstall(new LinkedList());
// There must always be a host server present. @@ -454,20 +426,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
/** * - * @return list of proxies for org - */ - public DataResult getProxies() { - DataResult retval = null; - SelectMode mode = ModeFactory.getMode("System_queries", - "org_proxy_servers"); - Map params = new HashMap(); - params.put("org_id", this.user.getOrg().getId().toString()); - retval = mode.execute(params); - return retval; - } - - /** - * * @return primary proxy for server */ public String getPrimaryProxy() { @@ -500,18 +458,22 @@ public class KickstartScheduleCommand extends BaseSystemOperation { * * @return DataResult list */ - public DataResult getProfiles() { - DataResult profiles = ProfileManager.compatibleWithChannel( - this.ksdata.getKickstartDefaults().getKstree().getChannel(), - user.getOrg(), null); - return profiles; + public List<ProfileDto> getProfiles() { + if (!isCobblerOnly()) { + List<ProfileDto> profiles = ProfileManager.compatibleWithChannel( + this.ksdata.getKickstartDefaults().getKstree().getChannel(), + user.getOrg(), null); + return profiles; + } + return Collections.EMPTY_LIST; + }
/** * @return Returns the id of the action scheduled to perform the kickstart. */ - public Long getKickstartActionId() { - return this.kickstartActionId; + public Action getScheduledAction() { + return this.scheduledAction; }
/** @@ -574,11 +536,13 @@ public class KickstartScheduleCommand extends BaseSystemOperation { packageAction.setPrerequisite(removal); log.debug("** Created packageAction ? " + packageAction.getId());
+ + log.debug("** Cancelling existing sessions."); + cancelExistingSessions(); + // Make sure we fail all existing sessions for this server since // we are scheduling a new one if (!cobblerOnly) { - log.debug("** Cancelling existing sessions."); - cancelExistingSessions(); kickstartSession = this.setupKickstartSession(packageAction); KickstartData data = getKsdata(); if (!data.isRawData()) { @@ -643,7 +607,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation { ActionFactory.save(kickstartAction); log.debug("** Created ksaction: " + kickstartAction.getId());
- this.kickstartActionId = kickstartAction.getId(); + this.scheduledAction = kickstartAction;
log.debug("** Done scheduling kickstart session"); return null; @@ -1285,25 +1249,17 @@ public class KickstartScheduleCommand extends BaseSystemOperation { return null; }
- - - /** - * Get the list of possible Activation keys to chose from - * @return DataResult of - */ - public DataResult getActivationKeys() { - return KickstartLister.getInstance(). - getActivationKeysInOrg(this.user.getOrg(), null); - } - /** * Get the list of compatible systems you could sync to * @return DataResult of System DTOs */ - public DataResult getCompatibleSystems() { - DataResult dr = SystemManager.systemsSubscribedToChannel( - this.getKsdata().getKickstartDefaults().getKstree().getChannel(), user); - return dr; + public List getCompatibleSystems() { + if (!isCobblerOnly()) { + DataResult dr = SystemManager.systemsSubscribedToChannel( + this.getKsdata().getKickstartDefaults().getKstree().getChannel(), user); + return dr; + } + return Collections.EMPTY_LIST; }
@@ -1322,23 +1278,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation { this.packagesToInstall = packagesToInstallIn; }
- - /** - * @return Returns the activationType. - */ - public String getActivationType() { - return activationType; - } - - - /** - * @param activationTypeIn The activationType to set. - */ - public void setActivationType(String activationTypeIn) { - this.activationType = activationTypeIn; - } - - /** * @return Returns the profileType. */ @@ -1355,22 +1294,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation { }
/** - * @return Returns the activationKeyIds. - */ - public Set getActivationKeyIds() { - return activationKeyIds; - } - - - /** - * @param activationKeyIdsIn The activationKeyIds to set. - */ - public void setActivationKeyIds(Set activationKeyIdsIn) { - this.activationKeyIds = activationKeyIdsIn; - } - - - /** * @return Returns the kickstartSession. */ public KickstartSession getKickstartSession() { @@ -1426,18 +1349,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation { }
/** - * Set the activationkey id to use - * @param idIn to add to the Kickstart - */ - public void setActivationKeyId(Long idIn) { - if (this.activationKeyIds == null) { - this.activationKeyIds = new HashSet(); - } - this.activationKeyIds.add(idIn); - - } - - /** * * @param serverIn Proxy Host to set for this ks session */ diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java index c1220a8..103013e 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java @@ -67,7 +67,6 @@ public class ProvisionVirtualInstanceCommand extends KickstartScheduleCommand { */ public ProvisionVirtualInstanceCommand(Long selectedServer, User userIn) { super(selectedServer, null, (KickstartData)null, userIn, null, null); - this.setActivationType(ACTIVATION_TYPE_EXISTING); this.setPackagesToInstall(new LinkedList()); this.setStaticDevice(""); } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java new file mode 100644 index 0000000..401ddd6 --- /dev/null +++ b/java/code/src/com/redhat/rhn/manager/kickstart/SSMScheduleCommand.java @@ -0,0 +1,263 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.manager.kickstart; + +import com.redhat.rhn.common.conf.ConfigDefaults; +import com.redhat.rhn.common.validator.ValidatorError; +import com.redhat.rhn.domain.action.Action; +import com.redhat.rhn.domain.kickstart.KickstartData; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.action.kickstart.ScheduleKickstartWizardAction; +import com.redhat.rhn.frontend.dto.SystemOverview; +import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; +import com.redhat.rhn.manager.system.SystemManager; + +import org.cobbler.Profile; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * + * SSMScheduleCommand + * @version $Rev$ + */ +public class SSMScheduleCommand { + // Required attributes + private User user; + private Date scheduleDate; + private List<SystemOverview> systems; + private boolean isCobblerOnly = false; + private boolean isIpBasedKs = false; + + //Optional + private String cobblerProfileName; + private KickstartData ksdata; + + private String profileType; + private Long packageProfileId; + private Long serverProfileId; + + private Server proxy; + + private List<Action> scheduledActions = new ArrayList<Action>(); + private String kernelParamType; + private String customKernelParams; + + private String postKernelParamType; + private String customPostKernelParams; + + private SSMScheduleCommand(User userIn, List<SystemOverview> systemsIn, Date dateIn) { + user = userIn; + systems = systemsIn; + scheduleDate = dateIn; + } + + /** + * Constructor for SSMScheduleCommand when we've selected a kickstart + * profile + * @param userIn the user + * @param systemsIn List of SystemOverview's to provision + * @param dateIn the date to schedule it for + * @param ksdataIn the kickstartData + * @return the SSMScheduleCommand + */ + public static SSMScheduleCommand init(User userIn, + List<SystemOverview> systemsIn, + Date dateIn, + KickstartData ksdataIn) { + SSMScheduleCommand command = new SSMScheduleCommand(userIn, systemsIn, dateIn); + command.ksdata = ksdataIn; + return command; + } + + /** + * Constructor for SSMScheduleCommand when we've selected a cobbler-only + * profile + * @param userIn the user + * @param systemsIn List of SystemOverview's to provision + * @param dateIn the date to schedule it for + * @param cobblerProfileNameIn the cobbler profile's name + * @return the SSMScheduleCommand + */ + public static SSMScheduleCommand initCobblerOnly(User userIn, + List<SystemOverview> systemsIn, Date dateIn, + String cobblerProfileNameIn) { + SSMScheduleCommand command = new SSMScheduleCommand(userIn, systemsIn, dateIn); + command.cobblerProfileName = cobblerProfileNameIn; + command.isCobblerOnly = true; + return command; + } + + /** + * Get a SSMScheduleCommand when were using IP ADDRESS + * base kickstarting + * @param userIn the user + * @param systemsIn List of SystemOverview's to provision + * @param dateIn the date to schedule it for + * @return the SSMScheduleCommand + */ + public static SSMScheduleCommand initIPKickstart(User userIn, + List<SystemOverview> systemsIn, Date dateIn) { + SSMScheduleCommand com = new SSMScheduleCommand(userIn, systemsIn, dateIn); + com.isIpBasedKs = true; + return com; + } + + + /** + * @param profileTypeIn The profileType to set. + */ + public void setProfileType(String profileTypeIn) { + this.profileType = profileTypeIn; + } + + /** + * @param packageProfileIdIn The packageProfileId to set. + */ + public void setPackageProfileId(Long packageProfileIdIn) { + this.packageProfileId = packageProfileIdIn; + } + + /** + * @param serverProfileIdIn The serverProfileId to set. + */ + public void setServerProfileId(Long serverProfileIdIn) { + this.serverProfileId = serverProfileIdIn; + } + + /** + * @return Returns the storedActions. + */ + public List<Action> getScheduledActions() { + return scheduledActions; + } + + + /** + * Store the Command + * @return list of ValidatorErrors that were encountered + */ + public List<ValidatorError> store() { + List<ValidatorError> errors = new ArrayList<ValidatorError>(); + + for (SystemOverview sys : systems) { + ValidatorError e = scheduleSystem(sys.getId()); + if (e != null) { + errors.add(e); + } + } + return errors; + } + + private ValidatorError scheduleSystem(Long sid) { + + KickstartData uniqueKs = ksdata; + String profileId = ""; + + + if (isIpBasedKs) { + Server ser = SystemManager.lookupByIdAndUser(sid, user); + uniqueKs = KickstartManager.getInstance().findProfileForServersNetwork(ser); + } + + if (uniqueKs == null && !isCobblerOnly) { + //an IP Range was not found for the ip address of this system + // and no org default was set. In the future maybe we should handle this + // but for now, we'll just move on + return null; + } + + KickstartScheduleCommand com; + if (isCobblerOnly) { + com = KickstartScheduleCommand.createCobblerScheduleCommand(sid, + cobblerProfileName, user, scheduleDate, null); + Profile prof = Profile.lookupById(CobblerXMLRPCHelper.getConnection(user), + cobblerProfileName); + profileId = prof.getId(); + } + else { + com = new KickstartScheduleCommand(sid, uniqueKs, user, scheduleDate, + null); + + profileId = uniqueKs.getCobblerId(); + } + + + + com.setKernelOptions(ScheduleKickstartWizardAction.parseKernelOptions( + customKernelParams, kernelParamType, profileId, false, user)); + com.setPostKernelOptions(ScheduleKickstartWizardAction.parseKernelOptions( + customPostKernelParams, postKernelParamType, profileId, true, user)); + com.setProfileType(profileType); + com.setProfileId(packageProfileId); + com.setServerProfileId(serverProfileId); + com.setProxy(proxy); + if (proxy == null) { + com.setKickstartServerName(ConfigDefaults.get().getCobblerHost()); + } + else { + com.setKickstartServerName(proxy.getHostname()); + } + + + ValidatorError error = com.store(); + + this.scheduledActions.add(com.getScheduledAction()); + return error; + } + + + /** + * @param proxyIn The proxy to set. + */ + public void setProxy(Server proxyIn) { + this.proxy = proxyIn; + } + + + /** + * @param kernelParamTypeIn The kernelParamType to set. + */ + public void setKernelParamType(String kernelParamTypeIn) { + this.kernelParamType = kernelParamTypeIn; + } + + + /** + * @param customKernelParamsIn The customKernelParams to set. + */ + public void setCustomKernelParams(String customKernelParamsIn) { + this.customKernelParams = customKernelParamsIn; + } + + + /** + * @param postKernelParamTypeIn The postKernelParamType to set. + */ + public void setPostKernelParamType(String postKernelParamTypeIn) { + this.postKernelParamType = postKernelParamTypeIn; + } + + + /** + * @param customPostKernelParamsIn The customPostKernelParams to set. + */ + public void setCustomPostKernelParams(String customPostKernelParamsIn) { + this.customPostKernelParams = customPostKernelParamsIn; + } +} diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartManagerTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartManagerTest.java new file mode 100644 index 0000000..be5055b --- /dev/null +++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartManagerTest.java @@ -0,0 +1,152 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.manager.kickstart.test; + +import com.redhat.rhn.domain.kickstart.KickstartData; +import com.redhat.rhn.domain.kickstart.KickstartIpRange; +import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; +import com.redhat.rhn.domain.server.NetworkInterface; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.server.test.ServerFactoryTest; +import com.redhat.rhn.manager.kickstart.KickstartManager; +import com.redhat.rhn.testing.BaseTestCaseWithUser; + + +public class KickstartManagerTest extends BaseTestCaseWithUser { + + + + public void testFindProfileForIpAddress() throws Exception { + + KickstartData ks = KickstartDataTest.createTestKickstartData(user.getOrg()); + + KickstartIpRange range = new KickstartIpRange(); + range.setMaxString("192.168.0.255"); + range.setMinString("192.168.0.1"); + range.setKsdata(ks); + range.setOrg(user.getOrg()); + ks.getIps().add(range); + + Server serv = ServerFactoryTest.createTestServer(user); + NetworkInterface nic = new NetworkInterface(); + nic.setName("eth0"); + nic.setIpaddr("192.168.0.5"); + nic.setServer(serv); + serv.getNetworkInterfaces().add(nic); + + + KickstartData result = KickstartManager.getInstance(). + findProfileForServersNetwork(serv); + assertEquals(ks, result); + + } + + /** + * Test with 'eth1' instead of eth0 + */ + public void testFindProfileForIpAddressEth1() throws Exception { + + KickstartData ks = KickstartDataTest.createTestKickstartData(user.getOrg()); + + KickstartIpRange range = new KickstartIpRange(); + range.setMaxString("192.168.0.255"); + range.setMinString("192.168.0.1"); + range.setKsdata(ks); + range.setOrg(user.getOrg()); + ks.getIps().add(range); + + Server serv = ServerFactoryTest.createTestServer(user); + NetworkInterface nic = new NetworkInterface(); + nic.setName("eth0"); + nic.setIpaddr("192.168.1.5"); //not in range + nic.setServer(serv); + serv.getNetworkInterfaces().add(nic); + + nic = new NetworkInterface(); + nic.setName("eth1"); + nic.setIpaddr("192.168.0.5"); //in range + nic.setServer(serv); + serv.getNetworkInterfaces().add(nic); + + + + KickstartData result = KickstartManager.getInstance(). + findProfileForServersNetwork(serv); + assertEquals(ks, result); + + } + + /* + * Test where 'eth0' doesn't match anything, but there should be a default + * Kickstart set; + */ + public void testFindProfileForIpAddressDefault() throws Exception { + + KickstartData ks = KickstartDataTest.createTestKickstartData(user.getOrg()); + + KickstartData ksDefault = KickstartDataTest.createTestKickstartData(user.getOrg()); + ksDefault.setOrgDefault(true); + + KickstartIpRange range = new KickstartIpRange(); + range.setMaxString("192.168.0.255"); + range.setMinString("192.168.0.1"); + range.setKsdata(ks); + range.setOrg(user.getOrg()); + ks.getIps().add(range); + + Server serv = ServerFactoryTest.createTestServer(user); + NetworkInterface nic = new NetworkInterface(); + nic.setName("eth0"); + nic.setIpaddr("192.168.1.5"); //not in range + nic.setServer(serv); + serv.getNetworkInterfaces().add(nic); + + + KickstartData result = KickstartManager.getInstance(). + findProfileForServersNetwork(serv); + assertEquals(ksDefault, result); + + } + + + /* + * Test where 'eth0' doesn't match anything, resulting in NULL + */ + public void testFindProfileForIpAddressNull() throws Exception { + + KickstartData ks = KickstartDataTest.createTestKickstartData(user.getOrg()); + + KickstartIpRange range = new KickstartIpRange(); + range.setMaxString("192.168.0.255"); + range.setMinString("192.168.0.1"); + range.setKsdata(ks); + range.setOrg(user.getOrg()); + ks.getIps().add(range); + + Server serv = ServerFactoryTest.createTestServer(user); + NetworkInterface nic = new NetworkInterface(); + nic.setName("eth0"); + nic.setIpaddr("192.168.1.5"); //not in range + nic.setServer(serv); + serv.getNetworkInterfaces().add(nic); + + + KickstartData result = KickstartManager.getInstance(). + findProfileForServersNetwork(serv); + assertNull(result); + + } + +} diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java index 011cf43..753cdde 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java @@ -47,6 +47,7 @@ import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.kickstart.KickstartScheduleCommand; import com.redhat.rhn.manager.profile.ProfileManager; import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest; +import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.testing.TestUtils;
import java.util.Date; @@ -185,8 +186,8 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase { KickstartScheduleCommand.ACTIVATION_TYPE_EXISTING, server, ksdata, profileType, activationKeyIds, otherServerId, profileId); assertNull(cmd.store()); - assertNotNull(cmd.getProxies()); - assertEquals(0, cmd.getProxies().size()); + assertNotNull(SystemManager.listProxies(user.getOrg())); + assertEquals(0, SystemManager.listProxies(user.getOrg())); }
public void testCommandPackageProfile() throws Exception { @@ -363,10 +364,6 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase { PackageManagerTest.addPackageToSystemAndChannel( ConfigDefaults.get().getKickstartPackageName(), server, c); // ksdata.getKsdefault().getKstree().setChannel(c); - - cmd.setActivationType(activationType); - - cmd.setActivationKeyIds(activationKeyIds); cmd.setProfileType(profileType); cmd.setServerProfileId(otherServerId); cmd.setProfileId(profileId); diff --git a/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java b/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java index 11840fc..22e37e0 100644 --- a/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java +++ b/java/code/src/com/redhat/rhn/manager/profile/ProfileManager.java @@ -36,6 +36,7 @@ import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.PackageListItem; import com.redhat.rhn.frontend.dto.PackageMetadata; +import com.redhat.rhn.frontend.dto.ProfileOverviewDto; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.manager.BaseManager; import com.redhat.rhn.manager.MissingEntitlementException; @@ -1252,7 +1253,7 @@ public class ProfileManager extends BaseManager { * @param orgId The id of the org the profiles are associated with. * @return DataResult of ProfileOverviewDto */ - public static DataResult listProfileOverviews(Long orgId) { + public static DataResult<ProfileOverviewDto> listProfileOverviews(Long orgId) {
SelectMode m = ModeFactory.getMode("profile_queries", "profile_overview");
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java index f6d50ad..b6dbc7c 100644 --- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java @@ -55,6 +55,7 @@ import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.frontend.dto.CustomDataKeyOverview; import com.redhat.rhn.frontend.dto.ErrataOverview; import com.redhat.rhn.frontend.dto.HardwareDeviceDto; +import com.redhat.rhn.frontend.dto.OrgProxyServer; import com.redhat.rhn.frontend.dto.SystemOverview; import com.redhat.rhn.frontend.dto.kickstart.KickstartSessionDto; import com.redhat.rhn.frontend.listview.ListControl; @@ -2571,5 +2572,18 @@ public class SystemManager extends BaseManager { return m.execute(params); }
- + /** + * returns a List proxies available in the given org + * @param org needed for org information + * @return list of proxies for org + */ + public static DataResult<OrgProxyServer> listProxies(Org org) { + DataResult retval = null; + SelectMode mode = ModeFactory.getMode("System_queries", + "org_proxy_servers"); + Map params = new HashMap(); + params.put("org_id", org.getId()); + retval = mode.execute(params); + return retval; + } } diff --git a/java/code/webapp/WEB-INF/nav/ssm.xml b/java/code/webapp/WEB-INF/nav/ssm.xml index 038c293..39e9f90 100644 --- a/java/code/webapp/WEB-INF/nav/ssm.xml +++ b/java/code/webapp/WEB-INF/nav/ssm.xml @@ -104,8 +104,11 @@ </rhn-tab> </rhn-tab>
- <rhn-tab name="Provisioning" acl="org_entitlement(rhn_provisioning)" url="/network/systems/ssm/provisioning/kickstart.pxt"> - <rhn-tab name="Kickstart" url="/network/systems/ssm/provisioning/kickstart.pxt" /> + <rhn-tab name="Provisioning" acl="org_entitlement(rhn_provisioning)" url="/rhn/systems/ssm/kickstart/KickstartableSystems.do"> + <rhn-tab name="Kickstart" url="/rhn/systems/ssm/kickstart/KickstartableSystems.do" > + <rhn-tab-url>/rhn/systems/ssm/kickstart/ScheduleByProfile.do</rhn-tab-url> + <rhn-tab-url>/rhn/systems/ssm/kickstart/ScheduleByIp.do</rhn-tab-url> + </rhn-tab> <rhn-tab name="Tag Systems" url="/network/systems/ssm/provisioning/tag_systems.pxt" /> <rhn-tab name="Rollback" url="/network/systems/ssm/provisioning/rollback.pxt"> <rhn-tab-url>/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt</rhn-tab-url> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf index 3840730..7b84574 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf @@ -25,7 +25,7 @@ function setStep(stepName) { <%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2><img src="/img/icon_kickstart_session-medium.gif" /><bean:message key="kickstart.schedule.heading4.jsp" /></h2> - +<c:set var="form" value="${kickstartScheduleWizardForm.map}"/> <html:form method="POST" action="${actionUrl}" styleId="wizard-form"> <html:hidden property="wizardStep" value="third" styleId="wizard-step" /> <html:hidden property="scheduleAsap" /> @@ -41,7 +41,9 @@ function setStep(stepName) { <html:hidden property="proxyHost" /> <table class="details"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf" %> - <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf" %> + <c:if test="${empty requestScope.cobblerOnlyProfile}" > + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf" %> + </c:if> </table> <c:if test="${empty regularKS}"> <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf" %> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf index 602b346..67c6dff 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/kernel-options.jspf @@ -6,27 +6,27 @@ <tr> <th width="10%"><bean:message key="kickstartdetails.jsp.kernel_options" />:</th> <td> - <c:set var="profile_url"><a href="/rhn/kickstart/KickstartDetailsEdit.do?ksid=${requestScope.profile.id}">${requestScope.profile.label}</a></c:set> + <c:set var="profile_url">(<a href="/rhn/kickstart/KickstartDetailsEdit.do?ksid=${requestScope.profile.id}">${requestScope.profile.label}</a>)</c:set> <c:choose> <c:when test = "${not requestScope.distro.rhnTree}"> - <c:set var="distro_url"><a href="/rhn/kickstart/TreeEdit.do?kstid=${requestScope.distro.id}">${requestScope.distro.label}</a></c:set> + <c:set var="distro_url">(<a href="/rhn/kickstart/TreeEdit.do?kstid=${requestScope.distro.id}">${requestScope.distro.label}</a>)</c:set> </c:when> <c:otherwise> - <c:set var="distro_url">${requestScope.distro.label}</c:set> + <c:set var="distro_url">(${requestScope.distro.label})</c:set> </c:otherwise> </c:choose> <html:radio value="distro" property="kernelParamsType" onclick="form.kernelParamsId.disabled = true;"> - <bean:message key="kickstart.schedule.kernel.options.distro" arg0="${distro_url}"/> - </html:radio>:<br/> + <bean:message key="kickstart.schedule.kernel.options.distro"/> + </html:radio> ${distro_url}:<br/> <c:choose> <c:when test = "${not empty requestScope.distro_kernel_params}"> ${requestScope.distro_kernel_params}</c:when> <c:otherwise>(<bean:message key="none specified"/>)</c:otherwise> </c:choose>
<br /><br /> <html:radio value="profile" property="kernelParamsType" onclick="form.kernelParamsId.disabled = true;"> - <bean:message key="kickstart.schedule.kernel.options.profile" arg0="${profile_url}"/> - </html:radio>:<br/> + <bean:message key="kickstart.schedule.kernel.options.profile"/> + </html:radio> ${profile_url}:<br/> <c:choose> <c:when test = "${not empty requestScope.profile_kernel_params}"> ${requestScope.profile_kernel_params}</c:when> <c:otherwise>(<bean:message key="none specified"/>)</c:otherwise> </c:choose> @@ -34,7 +34,7 @@
<html:radio value="custom" property="kernelParamsType" onclick="form.kernelParamsId.disabled = false;"> <strong><bean:message key="Custom" /></strong> - </html:radio>: <html:text styleId = "kernelParamsId" property="kernelParams" onkeydown="return blockEnter(event)" disabled= "${kickstartScheduleWizardForm.map.kernelParamsType ne "custom"}" /><br /><br /> + </html:radio>: <html:text styleId = "kernelParamsId" property="kernelParams" onkeydown="return blockEnter(event)" disabled= "${form.kernelParamsType ne "custom"}" /><br /><br /> rhn:tooltip<bean:message key="kickstart.schedule.kernel.options.custom.tip" arg0="${rhn:localize('Custom')}"/></rhn:tooltip> </td> </tr> @@ -42,15 +42,15 @@ <th width="10%"><bean:message key="kickstartdetails.jsp.post_kernel_options" />:</th> <td> <html:radio value="distro" property="postKernelParamsType" onclick="form.postKernelParamsId.disabled = true;"> - <bean:message key="kickstart.schedule.kernel.options.distro" arg0="${distro_url}"/> - </html:radio>:<br/> + <bean:message key="kickstart.schedule.kernel.options.distro"/> + </html:radio> ${distro_url}:<br/> <c:choose> <c:when test = "${not empty requestScope.distro_post_kernel_params}"> ${requestScope.distro_post_kernel_params}</c:when> <c:otherwise>(<bean:message key="none specified"/>)</c:otherwise> </c:choose><br /><br />
<html:radio value="profile" property="postKernelParamsType" onclick="form.postKernelParamsId.disabled = true;"> - <bean:message key="kickstart.schedule.kernel.options.profile" arg0="${profile_url}"/> - </html:radio>:<br/> + <bean:message key="kickstart.schedule.kernel.options.profile"/> + </html:radio> ${profile_url}:<br/> <c:choose> <c:when test = "${not empty requestScope.profile_post_kernel_params}"> ${requestScope.profile_post_kernel_params}</c:when> <c:otherwise>(<bean:message key="none specified"/>)</c:otherwise> </c:choose><br /><br /> @@ -59,7 +59,7 @@ <strong><bean:message key="Custom" /></strong> </html:radio>: <html:text styleId = "postKernelParamsId" property="postKernelParams" - onkeydown="return blockEnter(event)" disabled= "${kickstartScheduleWizardForm.map.postKernelParamsType ne "custom"}"/><br /><br /> + onkeydown="return blockEnter(event)" disabled= "${form.postKernelParamsType ne "custom"}"/><br /><br /> rhn:tooltip<bean:message key="kickstart.schedule.kernel.options.custom.tip" arg0="${rhn:localize('Custom')}"/></rhn:tooltip> </td>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf new file mode 100644 index 0000000..86e84fa --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf @@ -0,0 +1,43 @@ +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> + <!--Store form variables obtained from previous page --> + <input type="hidden" name="targetProfileType" value="${form.targetProfileType}"/> + <input type="hidden" name="targetProfile" value="${form.targetProfile}" /> + + <input type="hidden" name="postKernelParamsType" value="${form.postKernelParamsType}" /> + <input type="hidden" name="postKernelParams" value="${form.postKernelParams}" /> + <input type="hidden" name="kernelParamsType" value="${form.kernelParamsType}" /> + <input type="hidden" name="kernelParams" value="${form.kernelParams}" /> + + <!-- Store useful id fields--> + <input type="hidden" name="wizardStep" value="first" id="wizard-step" /> + <input type="hidden" name="cobbler_id" value="${form.cobbler_id}" id="cobbler_id" /> + <input type="hidden" name="sid" value="${form.sid}" /> + + <c:if test="${empty regularKS}"> + <!-- Store guest provisioning info --> + <input type="hidden" name="memoryAllocation" value="${form.memoryAllocation}" /> + <input type="hidden" name="virtualCpus" value="${form.virtualCpus}" /> + <input type="hidden" name="localStorageMegabytes" value="${form.localStorageMegabytes}" /> + <input type="hidden" name="diskPath" value="${form.diskPath}" /> + </c:if> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf" %> + + <c:if test="${requestScope.hasProfiles == 'true'}"> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf" %> + <table width="100%"> + <tr> + <td align="right"> + <c:if test="${not empty regularKS}"> + <input type="button" + value="<bean:message key="kickstart.schedule.button0.jsp" />" + onclick="setStep('fourth');this.form.submit();" /> + </c:if> + <input type="button" value="<bean:message key="kickstart.schedule.button1.jsp" />" onclick="setStep('second');this.form.submit();" /> + <input type="button" value="<bean:message key="kickstart.schedule.button2.jsp" />" onclick="setStep('third');this.form.submit();" /> + </td> + </tr> + </table> + </c:if> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf new file mode 100644 index 0000000..1a8635d --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf @@ -0,0 +1,32 @@ +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> +<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> + + <rl:list width="100%" emptykey = "kickstart.schedule.no.profiles.jsp" alphabarcolumn="label"> + <rl:decorator name = "PageSizeDecorator"/> + <rl:radiocolumn value="${current.cobblerId}" styleclass="first-column"/> + <rl:column headerkey="kickstartranges.jsp.profile" filterattr="label" sortable="true" sortattr="label"> + <a href="${current.cobblerUrl}">${fn:escapeXml(current.label)}</a> + </rl:column> + + <rl:column headerkey="kickstart.distro.label.jsp" sortable="true" sortattr="treeLabel"> + <c:out value="${current.treeLabel}"/> + </rl:column> + + <rl:column headerkey="kickstart.distro.sw_managed.jsp" sortable="true" sortattr="cobbler" + styleclass="last-column"> + <c:choose> + <c:when test="${current.cobbler}"> + <img src="/img/rhn-listicon-error.gif"> + </c:when> + <c:otherwise> + <img src="/img/rhn-listicon-checked.gif"> + </c:otherwise> + </c:choose> + </rl:column> + </rl:list> + <c:choose> + <c:when test="${not empty cobbler_only_tooltip}">rhn:tooltip* - <bean:message key="${cobbler_only_tooltip}"/></rhn:tooltip> </c:when> + <c:otherwise>rhn:tooltip* - <bean:message key="kickstart.distro.cobbler-only.tooltip"/></rhn:tooltip> </c:otherwise> + </c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf index 23ae53a..125c2e4 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf @@ -7,35 +7,59 @@ <th width="10%"><bean:message key="kickstart.schedule.sync.pkg.profile.jsp" />:</th> <td> <c:if test="${not empty regularKS}"> - <html:radio styleId="syncExisting" value="existing" property="targetProfileType" - onclick="form.syncPackageSelect.disabled = true; form.syncSystemSelect.disabled = true;"> + <input type="radio" name="targetProfileType" value="existing" + onclick="form.syncPackageSelect.disabled = true; form.syncSystemSelect.disabled = true;" + id="syncExisting" + <c:if test="${form.targetProfileType == 'existing'}">checked="checked"</c:if> + /> <bean:message key="kickstart.schedule.sync.pkg.profile.option1.jsp" /> - </html:radio><br /><br /> + <br /><br /> </c:if> - <html:radio styleId="syncPackage" - onclick="form.syncPackageSelect.disabled = false; form.syncSystemSelect.disabled = true;" - value="package" property="targetProfileType" disabled="${syncPackageDisabled}"> - <bean:message key="kickstart.schedule.sync.pkg.profile.option2.jsp" /> - </html:radio>: - <html:select styleId="syncPackageSelect" property="targetProfile" - disabled= "${kickstartScheduleWizardForm.map.targetProfileType ne "package"}"> - <html:optionsCollection property="syncPackages" - label="name" value="id"/> - </html:select> + + <input type="radio" name="targetProfileType" value="package" + onclick="form.syncPackageSelect.disabled = false; form.syncSystemSelect.disabled = true;" + id="syncPackage" + <c:if test="${form.targetProfileType == 'package'}">checked="checked"</c:if> + <c:if test="${syncPackageDisabled or empty form.syncPackages}">disabled="true"</c:if> + /> + <bean:message key="kickstart.schedule.sync.pkg.profile.option2.jsp" />: + + <select name="targetProfile" id="syncPackageSelect" + <c:if test="${form.targetProfileType ne 'package' or empty form.syncPackages}">disabled="true"</c:if> + > + <c:forEach var="package" items="${form.syncPackages}"> + <option + <c:if test="${package.id == form.targetProfile}">selected="selected"</c:if> + value='${package.id}'>${package.name}</option> + </c:forEach> + </select> <br /><br /> - <html:radio styleId="syncSystem" value="system" property="targetProfileType" - onclick="form.syncPackageSelect.disabled = true; form.syncSystemSelect.disabled = false;" - disabled="${syncSystemDisabled}"> - <bean:message key="kickstart.schedule.sync.pkg.profile.option3.jsp" /> - </html:radio>: - <html:select styleId="syncSystemSelect" property="targetProfile" - disabled= "${kickstartScheduleWizardForm.map.targetProfileType ne "system"}"> - <html:optionsCollection property="syncSystems" - label="name" value="id"/> - </html:select> - <br /><br /> - <html:radio styleId="syncNone" value="none" property="targetProfileType" - onclick="form.syncPackageSelect.disabled = true; form.syncSystemSelect.disabled = true;"> - <bean:message key="kickstart.schedule.sync.pkg.profile.option4.jsp" /></html:radio><br /> + <c:if test="${empty noSystemProfile}"> + <!--- System profile sync--> + <input type="radio" name="targetProfileType" value="system" + onclick="form.syncPackageSelect.disabled = true; form.syncSystemSelect.disabled = false;" + id="syncSystem" + <c:if test="${form.targetProfileType == 'system'}">checked="checked"</c:if> + <c:if test="${syncSystemDisabled or empty form.syncSystems}">disabled="true"</c:if> + /> +<bean:message key="kickstart.schedule.sync.pkg.profile.option3.jsp" />: + + <select name="targetProfile" id="syncSystemSelect" + <c:if test="${form.targetProfileType ne 'system' or empty form.syncSystems}">disabled="true"</c:if> + > + <c:forEach var="system" items="${form.syncSystems}"> + <option + <c:if test="${system.id == form.targetProfile}">selected="selected"</c:if> + value='${system.id}'>${system.name}</option> + </c:forEach> + </select> + <br /><br /> + </c:if> + <input type="radio" name="targetProfileType" value="none" + onclick="form.syncPackageSelect.disabled = true; form.syncSystemSelect.disabled = true;" + id="syncNone" + <c:if test="${empty form.targetProfileType or form.targetProfileType == 'none'}">checked="checked"</c:if> + /> +<bean:message key="kickstart.schedule.sync.pkg.profile.option4.jsp" /><br /> </td> </tr> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf new file mode 100644 index 0000000..3ad3e7f --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf @@ -0,0 +1,27 @@ +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> + <c:if test="${not empty proxies}"> + <h2> + <img src="/img/rhn-icon-proxy.gif" + alt="<bean:message key='system.common.proxyAlt' />" /> + <bean:message key="kickstart.schedule.heading.proxy.jsp"/> + </h2> + <c:choose> + <c:when test="${empty proxy_summary_key}"><p><bean:message key="kickstart.schedule.msg.proxy.jsp"/></p></c:when> + <c:otherwise><p><bean:message key="${proxy_summary_key}"/></p></c:otherwise> + + </c:choose> + <p> + <select name="proxyHost"> + <c:forEach var="proxy" items="${proxies}"> + <option + <c:if test="${proxy.value == param.proxyHost}">selected="selected"</c:if> + value='${proxy.value}'>${proxy.label}</option> + </c:forEach> + </select> + <br /> + <bean:message key="kickstart.schedule.tip.proxy.jsp"/> + </p> + </c:if> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf index 1c415bd..4ad4569 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf @@ -2,50 +2,6 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> - <!--Store form variables obtained from previous page --> - <input type="hidden" name="targetProfileType" value="${form.targetProfileType}"/> - <input type="hidden" name="targetProfile" value="${form.targetProfile}" /> - - <input type="hidden" name="postKernelParamsType" value="${form.postKernelParamsType}" /> - <input type="hidden" name="postKernelParams" value="${form.postKernelParams}" /> - <input type="hidden" name="kernelParamsType" value="${form.kernelParamsType}" /> - <input type="hidden" name="kernelParams" value="${form.kernelParams}" /> - - <!-- Store useful id fields--> - <input type="hidden" name="wizardStep" value="first" id="wizard-step" /> - <input type="hidden" name="cobbler_id" value="${form.cobbler_id}" id="cobbler_id" /> - <input type="hidden" name="sid" value="${form.sid}" /> - - <c:if test="${empty regularKS}"> - <!-- Store guest provisioning info --> - <input type="hidden" name="memoryAllocation" value="${form.memoryAllocation}" /> - <input type="hidden" name="virtualCpus" value="${form.virtualCpus}" /> - <input type="hidden" name="localStorageMegabytes" value="${form.localStorageMegabytes}" /> - <input type="hidden" name="diskPath" value="${form.diskPath}" /> - </c:if> - - <c:if test="${requestScope.hasProxies == 'true'}"> - <h2> - <img src="/img/rhn-icon-proxy.gif" - alt="<bean:message key='system.common.proxyAlt' />" /> - <bean:message key="kickstart.schedule.heading.proxy.jsp"/> - </h2> - <p> - <bean:message key="kickstart.schedule.msg.proxy.jsp"/> - </p> - <p> - <select name="proxyHost"> - <c:forEach var="proxy" items="${proxies}"> - <option - <c:if test="${proxy.value == param.proxyHost}">selected="selected"</c:if> - value='${proxy.value}'>${proxy.label}</option> - </c:forEach> - </select> - <br /> - <bean:message key="kickstart.schedule.tip.proxy.jsp"/> - </p> - </c:if> - <c:if test="${requestScope.hasProfiles == 'true'}"> <h2> <img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='system.common.scheduleAlt' />" /> @@ -74,18 +30,4 @@ </td> </tr> </table> - <hr /> - <table width="100%"> - <tr> - <td align="right"> - <c:if test="${not empty regularKS}"> - <input type="button" - value="<bean:message key="kickstart.schedule.button0.jsp" />" - onclick="setStep('fourth');this.form.submit();" /> - </c:if> - <input type="button" value="<bean:message key="kickstart.schedule.button1.jsp" />" onclick="setStep('second');this.form.submit();" /> - <input type="button" value="<bean:message key="kickstart.schedule.button2.jsp" />" onclick="setStep('third');this.form.submit();" /> - </td> - </tr> - </table> - </c:if> \ No newline at end of file + <hr /> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf index 87fc451..6a48ef8 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf @@ -50,6 +50,7 @@ <%@ include file="monitoring_status_systems.jspf" %> </c:if>
+ <c:if test = "${empty noErrata}"> <!-- errata Column --> <rl:column sortable="false" bound="false" @@ -65,7 +66,8 @@ </c:otherwise> </c:choose> </rl:column> - + </c:if> + <c:if test = "${empty noPackages}"> <!-- Packages Column --> <rl:column sortable="false" bound="false" @@ -82,7 +84,7 @@ </c:otherwise> </c:choose> </rl:column> - + </c:if> <!-- Name Channel Column --> <rl:column sortable="true" @@ -112,8 +114,9 @@ </rl:list> + <c:if test = "${empty noCsv}"> <rl:csv dataset="pageList" name="systemList" exportColumns="name,id,securityErrata,bugErrata,enhancementErrata,outdatedPackages,lastCheckin,entitlement"/> - + </c:if> rhn:submitted/ diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp new file mode 100644 index 0000000..eb331a9 --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp @@ -0,0 +1,83 @@ +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> +<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> +html:xhtml/ +<html> +<head> + <meta name="page-decorator" content="none" /> +</head> +<body> +<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> +<h2><bean:message key="ssm.kickstartable-systems.jsp.title"/></h2> + <div class="page-summary"> + <p> + <bean:message key="ssm.kickstartable-systems.jsp.summary"/> + </p> + </div> + +<rl:listset name="systemListSet" legend="system"> + rl:list + emptykey="nosystems.message" + alphabarcolumn="name" + filter="com.redhat.rhn.frontend.taglibs.list.filters.SystemOverviewFilter" + + <rl:decorator name="ElaborationDecorator"/> + <rl:decorator name="PageSizeDecorator"/> + + <rl:column sortable="true" + bound="false" + headerkey="systemlist.jsp.system" + sortattr="name" + styleclass="first-column" + defaultsort="asc"> + <%@ include file="/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf" %> + </rl:column> + + <!-- Base Channel Column --> + <rl:column sortable="false" + bound="false" + headerkey="systemlist.jsp.channel" + styleclass="last-column" > + <%@ include file="/WEB-INF/pages/common/fragments/channel/channel_list_fragment.jspf" %> + </rl:column> + </rl:list> +<c:if test="${empty disableSystems}"> +<h2><bean:message key="ssm.kickstartable-systems.jsp.systems"/></h2> + <p><bean:message key="ssm.kickstartable-systems.jsp.systems.summary"/></p> + +<table class="details"> + <tr> + <th> + <bean:message key="ssm.kickstartable-systems.jsp.type"/>: + </th> + <td> + + <input type="radio" name="scheduleManual" value="true" + <c:if test="${not empty disableProfiles}">disabled="true"</c:if> + <c:if test="${empty param.scheduleManual or param.scheduleManual =='true' }">checked="checked" </c:if> /> + <strong><bean:message key="ssm.kickstartable-systems.jsp.manual-summary"/></strong> + <br/> + <input type="radio" name="scheduleManual" value="false" id="ipId" + <c:if test="${not empty disableProfiles or not empty disableRanges}">disabled="true"</c:if> + <c:if test="${param.scheduleManual =='false'}">checked="checked" </c:if> /> + <strong><bean:message key="ssm.kickstartable-systems.jsp.ip-summary"/>*</strong> + <br/> + + rhn:tooltip* <bean:message key="ssm.kickstartable-systems.jsp.ip-tooltip"/></rhn:tooltip> + </td> + </tr> +</table> +<div align="right"> +<hr /> +<input type="submit" name="dispatch" value="${rhn:localize('ssm.config.subscribe.jsp.continue')}" + <c:if test="${not empty disableProfiles}">disabled="true"</c:if> + /> +</div> +</c:if> +rhn:submitted/ +</rl:listset> + +</body> +</html> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp new file mode 100644 index 0000000..7f87c6b --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/kickstart/ssm/schedule.jsp @@ -0,0 +1,122 @@ +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> + +html:xhtml/ +<html> +<body> +<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %> +<h2> + <img src="/img/icon_kickstart_session-medium.gif" + alt="<bean:message key='system.common.kickstartAlt' />" /> + <bean:message key="kickstart.schedule.heading1.jsp" /> +</h2> + + <div class="page-summary"> + <p> + <bean:message key="ssm.kickstart.schedule.heading1.text.jsp" /> + </p> + + <h2><bean:message key="kickstart.schedule.heading2.jsp" /></h2> + </div> + + + <div class="page-summary"> + <p> + + <c:if test="${empty requestScope.isIP}"> + <bean:message key="ssm.kickstart.schedule.heading2.text.jsp" /> + </c:if> + <c:if test="${not empty requestScope.isIP}"> + <bean:message key="ssm.kickstart.schedule.ip.heading2.text.jsp" /> + </c:if> + + </p> + </div> + + + + +<c:set var="regularKS" value="true"/> +<c:set var="form" value="${kickstartScheduleWizardForm.map}"/> +<c:set var="noSystemProfile" value="true"/> +<c:set var="cobbler_only_tooltip" value="ssm.kickstart.distro.cobbler-only.tooltip"/> +<c:set var="proxy_summary_key" value="ssm.kickstart.schedule.proxy.jsp.summary"/> + +<rl:listset name="form"> + <c:if test="${empty requestScope.isIP}"> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf" %> + </c:if> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf" %> + <br/> +<h2><img src="/img/icon_kickstart_session-medium.gif" /><bean:message key="kickstart.schedule.heading4.jsp" /></h2> + <table class="details"> + <tr> + <th width="10%"><bean:message key="kickstartdetails.jsp.kernel_options" />:</th> + <td> + <input type="radio" name="kernelParamsType" value="distro" onclick="form.kernelParamsId.disabled = true;" + <c:if test="${empty form.kernelParamsType or form.kernelParamsType == 'distro'}">checked="checked"</c:if> + /> + <bean:message key="kickstart.schedule.kernel.options.distro"/> + <br /><br /> + <input type="radio" name="kernelParamsType" value="profile" + <c:if test="${form.kernelParamsType == 'profile'}">checked="checked"</c:if> + onclick="form.kernelParamsId.disabled = true;" /> + <bean:message key="kickstart.schedule.kernel.options.profile"/> + + <br /><br /> + + <input type="radio" name="kernelParamsType" value="custom" + <c:if test="${form.kernelParamsType == 'custom'}">checked="checked"</c:if> + onclick="form.kernelParamsId.disabled = false;" /> + <strong><bean:message key="Custom" /></strong>: + <input type="text" name="kernelParams" value="${form.kernelParams}" + <c:if test="${form.kernelParamsType ne 'custom'}">disabled= "true"</c:if> + onkeydown="return blockEnter(event)" id="kernelParamsId" /><br /><br /> + rhn:tooltip<bean:message key="kickstart.schedule.kernel.options.custom.tip" arg0="${rhn:localize('Custom')}"/></rhn:tooltip> + </td> + </tr> + <tr> + <th width="10%"><bean:message key="kickstartdetails.jsp.post_kernel_options" />:</th> + <td> + <input type="radio" name="postKernelParamsType" value="distro" onclick="form.postKernelParamsId.disabled = true;" + <c:if test="${empty form.postKernelParamsType or form.postKernelParamsType == 'distro'}">checked="checked"</c:if> + /> + <bean:message key="kickstart.schedule.kernel.options.distro"/> + <br /><br /> + + <input type="radio" name="postKernelParamsType" value="profile" onclick="form.postKernelParamsId.disabled = true;" + <c:if test="${form.postKernelParamsType == 'profile'}">checked="checked"</c:if> + /> + <bean:message key="kickstart.schedule.kernel.options.profile"/><br /><br /> + + <input type="radio" name="postKernelParamsType" value="custom" onclick="form.postKernelParamsId.disabled = false;" + <c:if test="${form.postKernelParamsType == 'custom'}">checked="checked"</c:if> + /> + <strong><bean:message key="Custom" /></strong>: + <input type="text" name="postKernelParams" value="${form.postKernelParams}" + <c:if test="${form.postKernelParamsType ne 'custom'}">disabled= "true"</c:if> + onkeydown="return blockEnter(event)" id="postKernelParamsId" /> +<br /><br /> + rhn:tooltip<bean:message key="kickstart.schedule.kernel.options.custom.tip" arg0="${rhn:localize('Custom')}"/></rhn:tooltip> + </td> + </tr> + + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf" %> + </table> + + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf" %> +<div align="right"> +<hr /> +<input type="submit" name="dispatch" value="${rhn:localize('kickstart.schedule.button2.jsp')}"/> +</div> + +rhn:submitted/ +</rl:listset> + + +</body> +</html> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp index e824a80..7813b05 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp @@ -56,34 +56,10 @@ function setStep(stepName) { </p>
<c:set var="form" value="${kickstartScheduleWizardForm.map}"/> - +<c:set var="regularKS" value="true"/> <rl:listset name="wizard-form"> - <rl:list width="100%" emptykey = "kickstart.schedule.no.profiles.jsp" alphabarcolumn="label"> - <rl:decorator name = "PageSizeDecorator"/> - <rl:radiocolumn value="${current.cobblerId}" styleclass="first-column"/> - <rl:column headerkey="kickstartranges.jsp.profile" filterattr="label" sortable="true" sortattr="label"> - <a href="${current.cobblerUrl}">${fn:escapeXml(current.label)}</a> - </rl:column> - - <rl:column headerkey="kickstart.distro.label.jsp" sortable="true" sortattr="treeLabel"> - <c:out value="${current.treeLabel}"/> - </rl:column> - - <rl:column headerkey="kickstart.distro.sw_managed.jsp" sortable="true" sortattr="cobbler" - styleclass="last-column"> - <c:choose> - <c:when test="${current.cobbler}"> - <img src="/img/rhn-listicon-error.gif"> - </c:when> - <c:otherwise> - <img src="/img/rhn-listicon-checked.gif"> - </c:otherwise> - </c:choose> - </rl:column> - </rl:list> - rhn:tooltip* - <bean:message key="kickstart.distro.cobbler-only.tooltip"/></rhn:tooltip> - <c:set var="regularKS" value="true"/> - <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf" %> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/profile-list.jspf" %> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf" %> </rl:listset> </div> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp index ab2a6c4..1a459ff 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp @@ -62,7 +62,7 @@ function setStep(stepName) { <bean:message key="virtualization.provision.override.jsp.goto.advanced.options" arg0="${rhn:localize('kickstart.schedule.button1.jsp')}"/> <br/><br/> -<%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf" %> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf" %> </rl:listset> </div>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 6baa745..4f9d9ee 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -729,10 +729,7 @@ <form-property name="scheduleAsap" type="java.lang.String" /> <form-property name="scheduleDate" type="java.util.Date" /> <form-property name="nextAction" type="java.lang.String" /> - <form-property name="useExistingProfile" type="java.lang.String" /> <form-property name="proxyHost" type="java.lang.String" /> - <form-property name="activationKeys" type="java.util.List" /> - <form-property name="activationKey" type="java.lang.Long" /> <form-property name="kernelParamsType" type="java.lang.String" /> <form-property name="kernelParams" type="java.lang.String" /> <form-property name="postKernelParamsType" type="java.lang.String" /> @@ -4603,6 +4600,50 @@ <forward name="deleted" path="/profiles/List.do" redirect="true" /> </action>
+ <!-- Kickstart Pages SSM --> + <action path="/systems/ssm/kickstart/KickstartableSystems" + scope="request" + input="/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp" + type="com.redhat.rhn.frontend.action.kickstart.ssm.SsmKickstartableSystemsAction" + className="com.redhat.rhn.frontend.struts.RhnActionMapping"> + <set-property property="acls" value="org_entitlement(rhn_provisioning); user_role(config_admin)"/> + <forward name="default" + path="/WEB-INF/pages/kickstart/ssm/kickstartablesystems.jsp"/> + <forward name="scheduleByIp" + path="/systems/ssm/kickstart/ScheduleByIp.do" + redirect= "true"/> + <forward name="scheduleByProfile" + path="/systems/ssm/kickstart/ScheduleByProfile.do" + redirect= "true"/> + </action> + <action path="/systems/ssm/kickstart/ScheduleByProfile" + name ="kickstartScheduleWizardForm" + scope="request" + input="/WEB-INF/pages/kickstart/ssm/schedule.jsp" + type="com.redhat.rhn.frontend.action.kickstart.ssm.SsmKSScheduleAction" + parameter="profile" + className="com.redhat.rhn.frontend.struts.RhnActionMapping"> + <set-property property="acls" value="org_entitlement(rhn_provisioning);"/> + <forward name="default" + path="/WEB-INF/pages/kickstart/ssm/schedule.jsp"/> + <forward name="success" redirect= "true" + path="/systems/ssm/kickstart/KickstartableSystems.do"/> + </action> + + <action path="/systems/ssm/kickstart/ScheduleByIp" + name ="kickstartScheduleWizardForm" + scope="request" + input="/WEB-INF/pages/kickstart/ssm/schedule.jsp" + type="com.redhat.rhn.frontend.action.kickstart.ssm.SsmKSScheduleAction" + parameter="ip" + className="com.redhat.rhn.frontend.struts.RhnActionMapping"> + <set-property property="acls" value="org_entitlement(rhn_provisioning);"/> + <forward name="default" + path="/WEB-INF/pages/kickstart/ssm/schedule.jsp"/> + <forward name="success" redirect= "true" + path="/systems/ssm/kickstart/KickstartableSystems.do"/> + </action> + <!-- Kickstart Pages -->
<action path="/kickstart/Kickstarts" @@ -4610,7 +4651,7 @@ input="/WEB-INF/pages/kickstart/kickstarts.jsp" type="com.redhat.rhn.frontend.action.kickstart.KickstartsSetupAction" className="com.redhat.rhn.frontend.struts.RhnActionMapping"> - <set-property property="acls" value="org_entitlement(rhn_provisioning); user_role(config_admin)"/> + <set-property property="acls" value="org_entitlement(rhn_provisioning);"/> <forward name="default" path="/WEB-INF/pages/kickstart/kickstarts.jsp"/> </action> diff --git a/web/html/nav/ssm.xml b/web/html/nav/ssm.xml index 333a665..7f8289e 100644 --- a/web/html/nav/ssm.xml +++ b/web/html/nav/ssm.xml @@ -89,8 +89,11 @@ <rhn-tab name="Enable Configuration" url="/rhn/systems/ssm/config/Enable.do" /> </rhn-tab>
- <rhn-tab name="Provisioning" acl="org_entitlement(rhn_provisioning)" url="/network/systems/ssm/provisioning/kickstart.pxt"> - <rhn-tab name="Kickstart" url="/network/systems/ssm/provisioning/kickstart.pxt" /> + <rhn-tab name="Provisioning" acl="org_entitlement(rhn_provisioning)" url="/rhn/systems/ssm/kickstart/KickstartableSystems.do"> + <rhn-tab name="Kickstart" url="/rhn/systems/ssm/kickstart/KickstartableSystems.do" > + <rhn-tab-url>/rhn/systems/ssm/kickstart/ScheduleByProfile.do</rhn-tab-url> + <rhn-tab-url>/rhn/systems/ssm/kickstart/ScheduleByIp.do</rhn-tab-url> + </rhn-tab> <rhn-tab name="Tag Systems" url="/network/systems/ssm/provisioning/tag_systems.pxt" /> <rhn-tab name="Rollback" url="/network/systems/ssm/provisioning/rollback.pxt"> <rhn-tab-url>/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt</rhn-tab-url> diff --git a/web/html/network/systems/ssm/index.pxt b/web/html/network/systems/ssm/index.pxt index a2650fe..bb8da81 100644 --- a/web/html/network/systems/ssm/index.pxt +++ b/web/html/network/systems/ssm/index.pxt @@ -102,7 +102,7 @@ alt="Provisioning" /></td> <th>Provisioning:</th> <td> - <a href="/network/systems/ssm/provisioning/kickstart.pxt">Kickstart</a> systems <br /> + <a href="/rhn/systems/ssm/kickstart/KickstartableSystems.do">Kickstart</a> systems <br /> <a href="/network/systems/ssm/provisioning/tag_systems.pxt">Tag</a> systems for <a href="/network/systems/ssm/provisioning/rollback.pxt">snapshot rollback</a><br /> Run <a href="/network/systems/ssm/provisioning/remote_command.pxt">remote commands</a><br /> </td> diff --git a/web/html/network/systems/ssm/provisioning/kickstart.pxt b/web/html/network/systems/ssm/provisioning/kickstart.pxt deleted file mode 100644 index 932a4a4..0000000 --- a/web/html/network/systems/ssm/provisioning/kickstart.pxt +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf8"?> -<pxt-passthrough> - <pxt-use class="Grail::Frame" /> - <pxt-use class="Sniglets::HTML" /> - <pxt-use class="Sniglets::Users" /> -<pxt-use class="Sniglets::Kickstart" /> - - <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - - <h1><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> - - <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> - -<h2>Kickstart Selected Systems</h2> - -<pxt-include-late file="/network/components/message_queues/local.pxi" /> - -<div class="page-summary"> -<p>You may kickstart the selected provisioning-entitled systems.</p> -</div> - - -<rhn-kickstart-options-form action="kickstart_options.pxt"/> - - - </grail-canvas-template> - -</pxt-passthrough> diff --git a/web/html/network/systems/ssm/provisioning/kickstart_options.pxt b/web/html/network/systems/ssm/provisioning/kickstart_options.pxt deleted file mode 100644 index a308762..0000000 --- a/web/html/network/systems/ssm/provisioning/kickstart_options.pxt +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="utf8"?> -<pxt-passthrough> - <pxt-use class="Grail::Frame" /> - <pxt-use class="Sniglets::HTML" /> - <pxt-use class="Sniglets::Users" /> - <pxt-use class="Sniglets::Kickstart" /> - <pxt-use class="Sniglets::Lists" /> - - <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - - <h1><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> - - <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> - - <h2> -<img src="/img/rhn-kickstart_profile.gif" /> -Kickstart Options</h2> - -<div class="page-summary"> -<p>The following systems will be kickstarted:</p> -</div> - -<rhn-listview class="Sniglets::ListView::SystemList" mode="provisioning_systems_in_ks_set" alphabar_column="server_name"> - <formvars> - <var name="kstid" /> - <var name="kickstart_type" /> - <var name="ksid" /> - <var name="prid" /> - <var name="tid" /> - <var name="package_profile" /> - <var name="sync_sid" /> - <var name="activation_type" /> - <var name="kernel_params" /> - <var name="deploy_configs" /> - <var name="proxy_server_id" /> - <var name="preserve_proxy_route"/> - </formvars> - - <column name="System" label="server_name" sort_by="1" align="left" width="35%"> - <url>/rhn/systems/details/Overview.do?sid={column:id}</url> - </column> - <column name="Base Channel" label="channel_labels" align="left" /> - <column name="Entitlement" label="entitlement_level" width="5%"/> -</rhn-listview> - - - <div class="page-summary"> - <p> - The following options are available for the kickstarts: - </p> - </div> - -<br/> - -<pxt-include-late file="/network/components/message_queues/local.pxi" /> - -<rhn-kickstart-schedule-form action="kickstart_options.pxt"/> - - </grail-canvas-template> -</pxt-passthrough> - diff --git a/web/html/network/systems/ssm/provisioning/missing_packages.pxt b/web/html/network/systems/ssm/provisioning/missing_packages.pxt deleted file mode 100644 index 120dcb7..0000000 --- a/web/html/network/systems/ssm/provisioning/missing_packages.pxt +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf8"?> -<pxt-passthrough> - <pxt-use class="Grail::Frame" /> - <pxt-use class="Sniglets::HTML" /> - <pxt-use class="Sniglets::Users" /> - <pxt-use class="Sniglets::Kickstart" /> - <pxt-use class="Sniglets::Lists" /> - - <grail-canvas-template base="/templates/c.pxt" mode="main_canvas"> - - <h1><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1> - - <rhn-navi-nav prefix="system_set_manager" depth="0" file="/nav/ssm.xml" style="contentnav" /> - - <h2> - <img src="/img/rhn-icon-packages.gif" /> - Missing Packages - </h2> - - <div class="page-summary"> - <p> - The following packages are listed in the package profile which you have selected to sync, but not in the channels which the selected systems will be entitled to when the kickstart is complete. You can select a new target package profile by clicking 'select new package profile' below. - </p> - </div> - -<pxt-include-late file="/network/components/message_queues/local.pxi" /> - -<pxt-formvar> -<rhn-listview class="Sniglets::ListView::PackageList" mode="missing_packages_for_session"> - <column name="Package" label="nvre" /> - - <action name="Select new package profile" label="new_session" url="/network/systems/ssm/provisioning/kickstart_options.pxt"/> - <action name="Remove listed packages from sync" label="remove_packages" url="/network/systems/details/kickstart/options.pxt"/> - <action name="Subscribe to channels if available" label="subscribe_to_channels" url="/network/systems/details/kickstart/options.pxt"/> -</rhn-listview> -</pxt-formvar> - - </grail-canvas-template> -</pxt-passthrough>
commit 9a7e56427a4051b56e021ce1955da8b3e1b967c5 Author: Shannon Hughes shughes@redhat.com Date: Tue Jul 7 10:32:18 2009 -0400
small request to add orgid for pkilambi
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 63c6811..15d90f0 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 @@ -46,9 +46,11 @@ public class OrganizationTrustAction extends RhnAction { RequestContext requestContext = new RequestContext(request); User user = requestContext.getLoggedInUser(); String name = user.getOrg().getName(); + String orgid = user.getOrg().getId().toString(); DataList<TrustedOrgDto> result = OrgManager.trustedOrgs(user);
request.setAttribute("orgName", name); + request.setAttribute("orgId", orgid); request.setAttribute(ListTagHelper.PAGE_LIST, result); request.setAttribute(ListTagHelper.PARENT_URL, request.getRequestURI());
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 5e4248e..9044f24 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 @@ -19206,7 +19206,7 @@ Alternatively, you will want to download <strong>Incremental Channel Conte </trans-unit>
<trans-unit id="org.trust.header"> - <source>Organizations Trusted By {0}</source> + <source>Organizations Trusted By {0} ({1})</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/multiorg/Organizations.do</context> </context-group> diff --git a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp index 6bbae4f..5b0eee0 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/organizations.jsp @@ -13,7 +13,7 @@ <bean:message key="organizations.jsp.toolbar"/> </rhn:toolbar>
-<h2><bean:message key="org.trust.header" arg0="${orgName}"/></h2> +<h2><bean:message key="org.trust.header" arg0="${orgName}" arg1="${orgId}"/></h2>
<div> <rl:listset name="orgListSet">
commit 2b92840b8d26556fd557a2d1330a7b2fc280df1a Author: Miroslav Suchý msuchy@redhat.com Date: Tue Jul 7 10:03:38 2009 +0200
503187 - rewrite old config during upgrade, old file will be saved as .rpmorig
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index a579c0e..86d3850 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -261,7 +261,7 @@ fi %attr(640,root,apache) %config %{rhnconf}/rhn.conf %attr(750,root,apache) %dir %{rhnconf}/default %attr(640,root,apache) %{rhnconf}/default/rhn_proxy.conf -%attr(640,root,apache) %config(noreplace) %{httpdconf}/rhn_proxy.conf +%attr(640,root,apache) %config %{httpdconf}/rhn_proxy.conf # the cache %attr(750,apache,root) %dir %{_var}/cache/rhn %attr(750,apache,root) %dir %{_var}/cache/rhn/proxy-auth
commit 60ef3229d5bb1f85488ff2135cb1d7060589c303 Author: Shannon Hughes shughes@redhat.com Date: Mon Jul 6 15:42:17 2009 -0400
509457 - incorrectly using user id twice in channel query
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java index 0e6a006..f6d50ad 100644 --- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java @@ -2369,7 +2369,7 @@ public class SystemManager extends BaseManager { "systems_subscribed_to_channel_size"); Map params = new HashMap(); params.put("user_id", user.getId()); - params.put("org_id", user.getId()); + params.put("org_id", user.getOrg().getId()); params.put("cid", cid); DataResult toReturn = m.execute(params); return (Long) ((HashMap)toReturn.get(0)).get("count");
commit fc88a18a759d7e196744a700be13eaa1b5a9d0de Author: Brad Buckingham bbuckingham@redhat.com Date: Mon Jul 6 15:00:52 2009 -0400
509377 - confirmation pgs for Pkg Install & Remove updated to include pkg arch
The confirmation page that is shown as part of scheduling a package install or remove for a system was only showing the package NVRE. This commit will update it to also include the arch (i.e. NVREA) whenever arch is available. (This are actions done through Systems->system-> Software->Packages->List/Remove or Install).
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml index b289c06..907b496 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml @@ -388,6 +388,7 @@ ORDER BY UPPER(NVRE) <query params="sid"> SELECT PN.id || '|' || PE.id || '|' || PA.id AS ID_COMBO, PN.name || '-' || PE.evr.as_vre_simple() AS NVRE, + PN.name || '-' || PE.evr.as_vre_simple() || '.' || PA.label AS NVREA, PN.name AS name, PE.version, PE.release, @@ -634,6 +635,7 @@ SELECT P.id, P.summary, PP.name as provider <query params="sid"> SELECT distinct pn.name AS NAME, pn.name || '-' || full_list.evr.version || '-' || full_list.evr.release || DECODE(full_list.evr.epoch, NULL, '', ':' || full_list.evr.epoch) AS NVRE, + pn.name || '-' || full_list.evr.version || '-' || full_list.evr.release || DECODE(full_list.evr.epoch, NULL, '', ':' || full_list.evr.epoch) || '.' || full_list.arch_label AS NVREA, pn.id || '|' || lookup_evr(full_list.evr.epoch, full_list.evr.version, full_list.evr.release) || '|' || full_list.arch_id AS ID_COMBO, full_list.arch_label as ARCH FROM ( diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java b/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java index 81ecac9..d3341fc 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java @@ -433,14 +433,19 @@ public class PackageListItem extends IdComboDto { return this.getName() + "-" + e + "-" + v + "-" + r + "-" + a; }
- /** * {@inheritDoc} */ @Override public String getSelectionKey() { - return getIdCombo() + "~*~" + getNvre(); + if (getNvrea() != null) { + return getIdCombo() + "~*~" + getNvrea(); + } + else { + return getIdCombo() + "~*~" + getNvre(); + } } + /** * Returns a map of the keys used in this Package List . * @return a map.
commit 98b33e490fc085523da11444e6b8411d52a56a8f Author: John Matthews jmatthew@redhat.com Date: Mon Jul 6 10:24:45 2009 -0400
Automatic commit of package [spacewalk-proxy-installer] release [0.6.18-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec index 3213b3e..a9a952d 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer Summary: Spacewalk Proxy Server Installer Group: Applications/Internet License: GPLv2 -Version: 0.6.17 +Version: 0.6.18 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -87,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE answers.txt
%changelog +* Mon Jul 06 2009 John Matthews jmatthew@redhat.com 0.6.18-1 +- 509522 - remove conflicts and put provides to spacewalk-proxy-management + (msuchy@redhat.com) + * Thu Jul 2 2009 Miroslav Suchy msuchy@redhat.com 0.6.17-1 - 509417 - do not bother with monitoring if our parent is hosted
diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer index fef5f96..0465792 100644 --- a/rel-eng/packages/spacewalk-proxy-installer +++ b/rel-eng/packages/spacewalk-proxy-installer @@ -1 +1 @@ -0.6.17-1 proxy/installer/ +0.6.18-1 proxy/installer/
commit cf7da9f188d34dadce2deeb5b3ab64316a009622 Author: John Matthews jmatthew@redhat.com Date: Mon Jul 6 10:00:24 2009 -0400
Automatic commit of package [spacewalk-proxy] release [0.6.7-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index a53c9da..a579c0e 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 0.6.6 +Version: 0.6.7 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python @@ -289,6 +289,10 @@ fi
%changelog +* Mon Jul 06 2009 John Matthews jmatthew@redhat.com 0.6.7-1 +- 509522 - remove conflicts and put provides to spacewalk-proxy-management + (msuchy@redhat.com) + * Fri Jun 26 2009 John Matthews jmatthew@redhat.com 0.6.6-1 - fix build error
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy index 16c29cd..4ed2eea 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -0.6.6-1 proxy/proxy/ +0.6.7-1 proxy/proxy/
commit 85eae5bb4b193512274ffa107bfc202de9e95bb0 Author: John Matthews jmatthew@redhat.com Date: Mon Jul 6 09:58:26 2009 -0400
Automatic commit of package [spacewalk-koan] release [0.1.16-1].
diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec index b036399..8d97d6e 100644 --- a/client/tools/spacewalk-koan/spacewalk-koan.spec +++ b/client/tools/spacewalk-koan/spacewalk-koan.spec @@ -3,7 +3,7 @@ Name: spacewalk-koan Group: System Environment/Kernel License: GPLv2 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 0.1.15 +Version: 0.1.16 Release: 1%{?dist} BuildArch : noarch URL: https://fedorahosted.org/spacewalk @@ -49,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/rhn/actions/
%changelog +* Mon Jul 06 2009 John Matthews jmatthew@redhat.com 0.1.16-1 +- 508956 - fixing file preservation to actually use updated initrd.img + (mmccune@gibson.pdx.redhat.com) + * Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.1.15-1 - fixing spacewalk-koan spec file to build for 2.1 properly (jsherril@redhat.com) diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-koan index 02f7d1f..c41cff2 100644 --- a/rel-eng/packages/spacewalk-koan +++ b/rel-eng/packages/spacewalk-koan @@ -1 +1 @@ -0.1.15-1 client/tools/spacewalk-koan/ +0.1.16-1 client/tools/spacewalk-koan/
commit eaba0bda13b29b1024c86169247acdfcc137decc Author: John Matthews jmatthew@redhat.com Date: Mon Jul 6 09:57:40 2009 -0400
Automatic commit of package [spacewalk-web] release [0.6.10-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index eadcbde..4beef97 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -0.6.9-1 web/ +0.6.10-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 97782ed..cb93f33 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.9 +Version: 0.6.10 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -317,6 +317,11 @@ rm -rf $RPM_BUILD_ROOT
# $Id$ %changelog +* Mon Jul 06 2009 John Matthews jmatthew@redhat.com 0.6.10-1 +- 509376 - add Shared Channels to side navigation of Channels tab + (bbuckingham@redhat.com) +- 508859 - fixed proxy documenation links (shughes@redhat.com) + * Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.9-1 - 506154 - Added "wrap" option to textarea widget. Set to off for remote command script editing page. (jason.dobies@redhat.com)
commit 0f678952e15e55a3cdbb73d356e38a51c3187685 Author: John Matthews jmatthew@redhat.com Date: Mon Jul 6 09:56:22 2009 -0400
Automatic commit of package [spacewalk-schema] release [0.6.12-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 35a7328..da2ac22 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -0.6.11-1 schema/spacewalk/ +0.6.12-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 31adf3b..e4e85b2 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -2,7 +2,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server
-Version: 0.6.11 +Version: 0.6.12 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz
@@ -52,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-schema-upgrade*
%changelog +* Mon Jul 06 2009 John Matthews jmatthew@redhat.com 0.6.12-1 +- 509029 - schema/upgrade - update the text used for action type = + kickstart_guest.initiate (bbuckingham@redhat.com) + * Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.11-1 - rebuild
commit a9eac21e86da90360b28b1bb94563af5f2e514bd Author: John Matthews jmatthew@redhat.com Date: Mon Jul 6 09:53:14 2009 -0400
Automatic commit of package [spacewalk-java] release [0.6.30-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 206f021..327de39 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -12,7 +12,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.29 +Version: 0.6.30 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -250,6 +250,56 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
%changelog +* Mon Jul 06 2009 John Matthews jmatthew@redhat.com 0.6.30-1 +- 509444 - remove delete action system from virt page (shughes@redhat.com) +- 509371 - SSM->Install,Remove,Verify - minor fixes to Package Name and Arch + (bbuckingham@redhat.com) +- 509411 - make sure we delete the ks template when we delete a profile + (mmccune@gibson.pdx.redhat.com) +- 509364 - fix SSM->Upgrade arch that being listed (bbuckingham@redhat.com) +- 509376 - add Shared Channels to side navigation of Channels tab + (bbuckingham@redhat.com) +- 509270 - clarify text on Channels -> All Channels page + (bbuckingham@redhat.com) +- 509019 - adding tooltip on howto copypaste (mmccune@gibson.pdx.redhat.com) +- 509221 - System->Package->Install incorrectly using arch name vs label + (bbuckingham@redhat.com) +- 509213 - fixed channel provider column, don't link red hat inc + (shughes@redhat.com) +- 509027 - kickstart profile edit - update length of supported kernel and post + kernel options (bbuckingham@redhat.com) +- 509011 - apidoc - kickstart.deleteProfile - update kslabel description + (bbuckingham@redhat.com) +- refactor config constants to their own class with statics and methods. + (mmccune@gibson.pdx.redhat.com) +- 509037 - fixing issue where looking for packages in child channels would + result in base channels (jsherril@redhat.com) +- 508790 - switch to /var/lib/libvirt/images for our default path + (mmccune@gibson.pdx.redhat.com) +- 508966 - fixed issue where could not set package profile for a kickstart, + rewrote to new list tag (jsherril@redhat.com) +- 508789 - Block deletion of last remaining Satellite Administrator. + (dgoodwin@redhat.com) +- Bumping timeout on Message Queue Test. (dgoodwin@redhat.com) +- 508962 - Fixed KS software edit page to hide repo section if tree is not rhel + 5 (paji@redhat.com) +- 508790 - use virbr0 for KVM guest defaults (mmccune@gibson.pdx.redhat.com) +- 508705 - Fixed KS details page to hide virt options if virt type is none + (paji@redhat.com) +- 508885 - fixed ks schedule pages to remember proxy host (paji@redhat.com) +- Made the radio button in schedule ks page choose scheduleAsap by default + (paji@redhat.com) +- 508736 - Corrected spec to properly set the cobbler/snippets/spacewalk + symlink (paji@redhat.com) +- 508141 - api - system.config.deployAll updated w/ better exception when + system not config capable (bbuckingham@redhat.com) +- 508323 - fixing issue with creating cobbler system records with spaces (which + would fail) (jsherril@redhat.com) +- 508220 - fixed channel sharing syntax error on english side + (shughes@redhat.com) +- Fix API call to remove server custom data value. (dgoodwin@redhat.com) +- ErrataSearch, add "synopsis" to ALL_FIELDS (jmatthew@redhat.com) + * Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.29-1 - Remove catch/log return null of HibernateExceptions. (dgoodwin@redhat.com) - Fix server migration when source org has > 1000 org admins. diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 51d3e20..6ff39f7 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.29-1 java/ +0.6.30-1 java/
commit 275d84522d0ec98da869340a91642e8e60fd433e Author: Miroslav Suchý msuchy@redhat.com Date: Fri Jul 3 11:37:29 2009 +0200
509522 - remove conflicts and put provides to spacewalk-proxy-management
this way we should be able to upgrade from command line and not force older proxies to upgrade to newly provided rhns-proxy-tool package
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec index 69dad52..3213b3e 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -19,7 +19,6 @@ Requires: glibc-common Requires: chkconfig Requires: libxslt BuildRequires: /usr/bin/docbook2man -Conflicts: rhns-proxy-tools < 5.3.0 Obsoletes: proxy-installer < 5.3.0 Provides: proxy-installer = 5.3.0
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index e83ca74..a53c9da 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -42,6 +42,7 @@ Obsoletes: rhns-proxy < 5.3.0 Obsoletes: rhns-proxy-management < 5.3.0 BuildRequires: /usr/bin/docbook2man Obsoletes: rhns-proxy-tools < 5.3.0 +Provides: rhns-proxy-tools = 5.3.0 Obsoletes: spacewalk-proxy-tools < 0.5.3 Provides: spacewalk-proxy-tools = %{version}
commit 53e73c11e3d17c2681135655df531ced7d60b3ed Author: Miroslav Suchý msuchy@redhat.com Date: Fri Jul 3 11:06:29 2009 +0200
Automatic commit of package [spacewalk-backend] release [0.6.16-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index d9dea5e..f89dbde 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 0.6.15 +Version: 0.6.16 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -568,6 +568,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$ %changelog +* Fri Jul 3 2009 Miroslav Suchy msuchy@redhat.com 0.6.16-1 +- 509516 - failure to check for non-existant header (Mark Chappell m.d.chappell@bath.ac.uk) +- 509444 - remove delete action system from virt page (Shannon Hughes shughes@redhat.com) +- 509371 - SSM->Install,Remove,Verify - minor fixes to Package Name and Arch (Brad Buckingham bbuckingham@redhat.com) + * Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.15-1 - change comments to docstrings (msuchy@redhat.com) - change comments to docstrings (msuchy@redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 65f3b59..3ebd6c4 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.15-1 backend/ +0.6.16-1 backend/
commit f04c0d4bf19fcfcbc9e691fc7ad8be37a26805ca Author: Mark Chappell m.d.chappell@bath.ac.uk Date: Thu Jul 2 16:51:23 2009 +0100
509516 - failure to check for non-existant header
diff --git a/backend/common/rhnRepository.py b/backend/common/rhnRepository.py index 85e0408..c66b2d9 100644 --- a/backend/common/rhnRepository.py +++ b/backend/common/rhnRepository.py @@ -101,8 +101,9 @@ class Repository(RPC_Base): # Must be a client. We'll determine the redirect capability via # the x-rhn-transport-capability header instead. transport_cap = rhnFlags.get('x-rhn-transport-capability') - transport_cap_list = transport_cap.split('=') - redirectsSupported = transport_cap_list[0] == 'follow-redirects' and transport_cap_list[1] >= 2 + if transport_cap : + transport_cap_list = transport_cap.split('=') + redirectsSupported = transport_cap_list[0] == 'follow-redirects' and transport_cap_list[1] >= 2
if redirectsSupported: log_debug(3, "Client supports redirects.")
commit 5e4b4dc66d7b8009c0ac606cacff5cd4340c5abe Author: Shannon Hughes shughes@redhat.com Date: Thu Jul 2 15:55:12 2009 -0400
509444 - remove delete action system from virt page
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 c1098ab..c240af8 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 @@ -89,7 +89,7 @@ public class VirtualGuestsListSetupAction extends BaseSystemListSetupAction { // Set parameter for the actions dropdown: List actionOptions = new LinkedList(); String [] resourceBundleKeys = { - "virtualguestslist.jsp.deletesystem", + //"virtualguestslist.jsp.deletesystem", "virtualguestslist.jsp.startsystem", "virtualguestslist.jsp.suspendsystem", "virtualguestslist.jsp.resumesystem",
commit 0371776775b3aaa5fc3933eeb6a96e514acf12bb Author: Brad Buckingham bbuckingham@redhat.com Date: Thu Jul 2 15:42:56 2009 -0400
509371 - SSM->Install,Remove,Verify - minor fixes to Package Name and Arch
There were a few minor changes needed to the queries used for some of the SSM pages to properly display package name and arch. This commit addresses the following:
SSM->Install - Package Name included arch (e.g. nvrea) - updated to drop the arch - Architecture listed the rhnPackageArch.name (e.g. AMD64) instead of rhnPackageArch.label - updated to address that for consistency
SSM->Remove, SSM->Verify - Package Name included arch (e.g. nvrea) - updated to drop the arch
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml index 8682a4b..b289c06 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml @@ -368,10 +368,10 @@ ORDER BY UPPER(PN.name) will be the name -->
SELECT DISTINCT - PN.name || '-' || PE.evr.as_vre_simple() || '.' || PA.label nvre, + PN.name || '-' || PE.evr.as_vre_simple() AS nvre, PN.id || '|' || CNP.evr_id || '|' || PA.id AS id_combo, (SELECT MAX(summary) FROM rhnPackage P WHERE P.id = CNP.package_id) SUMMARY, - PA.name as arch + PA.label as arch FROM rhnPackageName PN, rhnPackageEVR PE, rhnPackageArch PA, @@ -454,7 +454,7 @@ SELECT PN.id || '|' || SPE.id AS ID_COMBO, <mode name="packages_from_server_set" class="com.redhat.rhn.frontend.dto.SsmRemovePackageListItem"> <query params="user_id, set_label"> SELECT PN.ID || '|' || PE.ID || '|' || PA.ID AS id_combo, - PN.name || '-' || PE.evr.as_vre_simple() || '.' || PA.label nvre, + PN.name || '-' || PE.evr.as_vre_simple() AS nvre, PA.label AS arch, X.num_systems AS num_systems FROM rhnPackageName PN,
commit 1f721ce25bc2249a70e4905c6c44c4e5d927162c Author: Miroslav Suchý msuchy@redhat.com Date: Thu Jul 2 20:02:56 2009 +0200
Automatic commit of package [spacewalk-proxy-installer] release [0.6.17-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec index 9914150..69dad52 100644 --- a/proxy/installer/spacewalk-proxy-installer.spec +++ b/proxy/installer/spacewalk-proxy-installer.spec @@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer Summary: Spacewalk Proxy Server Installer Group: Applications/Internet License: GPLv2 -Version: 0.6.16 +Version: 0.6.17 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE answers.txt
%changelog +* Thu Jul 2 2009 Miroslav Suchy msuchy@redhat.com 0.6.17-1 +- 509417 - do not bother with monitoring if our parent is hosted + * Tue Jun 23 2009 Miroslav Suchy msuchy@redhat.com 0.6.16-1 - suggest sane default value of proxy for spacewalk too
diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer index 96ca46c..fef5f96 100644 --- a/rel-eng/packages/spacewalk-proxy-installer +++ b/rel-eng/packages/spacewalk-proxy-installer @@ -1 +1 @@ -0.6.16-1 proxy/installer/ +0.6.17-1 proxy/installer/
commit f87ef5c40858bfd85a6fb850ff88a62173a95c29 Author: Miroslav Suchý msuchy@redhat.com Date: Thu Jul 2 19:57:06 2009 +0200
509417 - do not bother with monitoring if our parent is hosted
diff --git a/proxy/installer/configure-proxy.sh b/proxy/installer/configure-proxy.sh index e7dd290..e590777 100755 --- a/proxy/installer/configure-proxy.sh +++ b/proxy/installer/configure-proxy.sh @@ -281,45 +281,51 @@ if [ $? -ne 0 ]; then config_error 2 "Installation of package spacewalk-proxy-management failed." fi
-rpm -q spacewalk-proxy-monitoring >/dev/null -MONITORING=$? -if [ $MONITORING -ne 0 ]; then +if [ "$RHN_PARENT" == "xmlrpc.rhn.redhat.com" ]; then + #skip monitoring part for hosted + MONITORING=1 + ENABLE_SCOUT=0 +else + rpm -q spacewalk-proxy-monitoring >/dev/null + MONITORING=$? + if [ $MONITORING -ne 0 ]; then echo "You do not have monitoring installed." echo "Do you want to install monitoring scout?"
default_or_input "Will run '$YUM_OR_UPDATE spacewalk-proxy-monitoring'." INSTALL_MONITORING 'Y/n' INSTALL_MONITORING=$(yes_no $INSTALL_MONITORING) - if [ "$INSTALL_MONITORING" = "1" ]; then - $YUM_OR_UPDATE spacewalk-proxy-monitoring - MONITORING=$? - fi -else - $YUM_OR_UPDATE spacewalk-proxy-monitoring - # check if package install successfully - rpm -q spacewalk-proxy-monitoring >/dev/null - if [ $? -ne 0 ]; then - config_error 3 "Installation of package spacewalk-proxy-monitoring failed." + if [ "$INSTALL_MONITORING" = "1" ]; then + $YUM_OR_UPDATE spacewalk-proxy-monitoring + MONITORING=$? + fi + else + $YUM_OR_UPDATE spacewalk-proxy-monitoring + # check if package install successfully + rpm -q spacewalk-proxy-monitoring >/dev/null + if [ $? -ne 0 ]; then + config_error 3 "Installation of package spacewalk-proxy-monitoring failed." + fi fi -fi -if [ $MONITORING -eq 0 ]; then - #here we configure monitoring - #and with cluster.ini - echo "Configuring monitoring." + if [ $MONITORING -eq 0 ]; then + #here we configure monitoring + #and with cluster.ini + echo "Configuring monitoring." default_or_input "Monitoring parent" MONITORING_PARENT "$RHN_PARENT" RESOLVED_IP=$(/usr/bin/getent hosts $RHN_PARENT | cut -f1 -d' ') default_or_input "Monitoring parent IP" MONITORING_PARENT_IP "$RESOLVED_IP" default_or_input "Enable monitoring scout" ENABLE_SCOUT "Y/n" ENABLE_SCOUT=$(yes_no $ENABLE_SCOUT) - SCOUT_SHARED_KEY=`/usr/bin/rhn-proxy-activate --enable-monitoring \ - --quiet \ + SCOUT_SHARED_KEY=`/usr/bin/rhn-proxy-activate --enable-monitoring \ + --quiet \ --server="$RHN_PARENT" \ --http-proxy="$HTTP_PROXY" \ --http-proxy-username="$HTTP_USERNAME" \ --http-proxy-password="$HTTP_PASSWORD" \ --ca-cert="$CA_CHAIN" | \ awk '/: [0-9a-f]+/ { print $4 }' ` -else - ENABLE_SCOUT=0 + else + ENABLE_SCOUT=0 + fi fi
# size of squid disk cache will be 60% of free space on /var/spool/squid
commit e24b4184612d6b656ca308a19ac99d24012c3fe5 Author: Miroslav Suchý msuchy@redhat.com Date: Thu Jul 2 19:43:13 2009 +0200
Automatic commit of package [spacewalk-proxy-selinux] release [0.6.6-1].
diff --git a/rel-eng/packages/spacewalk-proxy-selinux b/rel-eng/packages/spacewalk-proxy-selinux index e588cff..b1b03b1 100644 --- a/rel-eng/packages/spacewalk-proxy-selinux +++ b/rel-eng/packages/spacewalk-proxy-selinux @@ -1 +1 @@ -0.6.5-1 selinux/spacewalk-proxy-selinux/ +0.6.6-1 selinux/spacewalk-proxy-selinux/ diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec index 8a6e4e8..d71e256 100644 --- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec +++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec @@ -7,7 +7,7 @@ %define modulename spacewalk-proxy
Name: spacewalk-proxy-selinux -Version: 0.6.5 +Version: 0.6.6 Release: 1%{?dist} Summary: SELinux policy module supporting Spacewalk Proxy
@@ -109,6 +109,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog +* Thu Jul 2 2009 Miroslav Suchy msuchy@redhat.com 0.6.6-1 +- 509369 - run restorecon for /var/www/html/pub since its content is not owned by any package + * Thu Jun 18 2009 Jan Pazdziora 0.6.5-1 - 505606 - Require at least selinux-policy 2.4.6-80
commit 0d016c2a4847f20f569c412ea9849d5ea0a704b7 Author: Miroslav Suchý msuchy@redhat.com Date: Thu Jul 2 19:42:46 2009 +0200
Automatic commit of package [spacewalk-selinux] release [0.6.12-1].
diff --git a/rel-eng/packages/spacewalk-selinux b/rel-eng/packages/spacewalk-selinux index 5a9e4ab..7492603 100644 --- a/rel-eng/packages/spacewalk-selinux +++ b/rel-eng/packages/spacewalk-selinux @@ -1 +1 @@ -0.6.11-1 selinux/spacewalk-selinux/ +0.6.12-1 selinux/spacewalk-selinux/ diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spacewalk-selinux/spacewalk-selinux.spec index b653b88..3673275 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux.spec +++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec @@ -7,7 +7,7 @@ %define modulename spacewalk
Name: spacewalk-selinux -Version: 0.6.11 +Version: 0.6.12 Release: 1%{?dist} Summary: SELinux policy module supporting Spacewalk Server
@@ -115,6 +115,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog +* Thu Jul 2 2009 Miroslav Suchy msuchy@redhat.com 0.6.12-1 +- 509369 - run restorecon for /var/www/html/pub since its content is not owned by any package + * Thu Jun 18 2009 Jan Pazdziora 0.6.11-1 - 505606 - Require at least selinux-policy 2.4.6-80
commit c5dc1eec4fa163d3e6efbebaab799bbec148e39c Author: Mike McCune mmccune@gibson.pdx.redhat.com Date: Thu Jul 2 10:36:59 2009 -0700
509411 - make sure we delete the ks template when we delete a profile
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java index f0fe369..b3569d9 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartFactory.java @@ -31,6 +31,7 @@ import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.criterion.Restrictions;
+import java.io.File; import java.util.Collections; import java.util.Date; import java.util.HashMap; @@ -376,13 +377,19 @@ public class KickstartFactory extends HibernateFactory { else { log.debug("No ks meta for this profile."); } - String path = ksdataIn.getCobblerFileName(); - if (p != null && p.getKickstart() != null) { - path = p.getKickstart(); - } + String path = getKickstartTemplatePath(ksdataIn, p); + log.debug("writing ks file to : " + path); FileUtils.writeStringToFile(fileData, path); }
+ private static String getKickstartTemplatePath(KickstartData ksdata, Profile p) { + String path = ksdata.getCobblerFileName(); + if (p != null && p.getKickstart() != null) { + path = p.getKickstart(); + } + return path; + } + /** * * @param ksdataIn Kickstart Data to be stored in db @@ -396,6 +403,14 @@ public class KickstartFactory extends HibernateFactory { * @return number of tuples affected by delete */ public static int removeKickstartData(KickstartData ksdataIn) { + Profile p = Profile.lookupById(CobblerXMLRPCHelper.getAutomatedConnection(), + ksdataIn.getCobblerId()); + String path = getKickstartTemplatePath(ksdataIn, p); + File file = new File(path); + if (file.exists()) { + log.debug("deleting : " + path); + file.delete(); + } return singleton.removeObject(ksdataIn); }
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java index 9681c92..bfd8a8d 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java @@ -293,6 +293,11 @@ public class KickstartDataTest extends BaseTestCaseWithUser { .lookupKickstartDataByIdAndOrg(user.getOrg(), ksd.getId())); assertNull(lookupById(user.getOrg(), ksd.getId())); assertNull(lookupByLabel(ksd.getLabel())); + + String path = ksd.getCobblerFileName(); + File f = new File(path); + assertFalse(f.exists()); + }
public void testChildChannels() throws Exception {
commit c9378976ac6eba03e9a3d07ac0a34bb646a06351 Author: Miroslav Suchý msuchy@redhat.com Date: Thu Jul 2 19:36:00 2009 +0200
509369 - run restorecon for /var/www/html/pub since its content is not owned by any package
diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux-enable b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux-enable index e99f36d..562a33f 100644 --- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux-enable +++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux-enable @@ -8,5 +8,5 @@ for selinuxvariant in mls strict targeted /usr/share/selinux/${selinuxvariant}/spacewalk-proxy.pp || : done
-/sbin/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool/rhn-proxy +/sbin/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool/rhn-proxy /var/www/html/pub
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux-enable b/selinux/spacewalk-selinux/spacewalk-selinux-enable index 05dd951..8100e26 100644 --- a/selinux/spacewalk-selinux/spacewalk-selinux-enable +++ b/selinux/spacewalk-selinux/spacewalk-selinux-enable @@ -43,7 +43,7 @@ for selinuxvariant in mls strict targeted done
/sbin/restorecon -rvvi /etc/rhn/satellite-httpd/conf/satidmap.pl /usr/sbin/rhn-sat-restart-silent /var/log/rhn /var/cache/rhn \ - /usr/bin/rhn-sudo-ssl-tool /usr/bin/rhn-sudo-load-ssl-cert + /usr/bin/rhn-sudo-ssl-tool /usr/bin/rhn-sudo-load-ssl-cert /var/www/html/pub
/usr/sbin/setsebool -P httpd_enable_cgi 1 /usr/sbin/setsebool -P httpd_can_network_connect 1
commit 5736aa9e89ae8f9e5a126d905adfd083b14113a8 Author: Brad Buckingham bbuckingham@redhat.com Date: Thu Jul 2 11:41:11 2009 -0400
509364 - fix SSM->Upgrade arch that being listed
The SSM->Upgrade page was listing arch as rhnPackageArch.name vs rhnPackageArch.label. This is inconsistent as for the 64 bit pkgs. E.g. name=AMD64 label=x86_64
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml index 9355c70..8682a4b 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml @@ -689,7 +689,7 @@ SELECT P.id AS ID, PE.release AS RELEASE, PE.epoch AS EPOCH, PN.name AS NAME, - PA.name AS ARCH, + PA.label AS ARCH, E.advisory_type, E.advisory, E.id AS ADVISORY_ID, @@ -714,7 +714,7 @@ GROUP BY P.id, PE.version, PE.release, PE.epoch, - PA.name, + PA.label, PA.id, PN.id, PE.id,
commit fd9dfa26884c6db06770034380f2d1ee3e8cd7ca Author: Brad Buckingham bbuckingham@redhat.com Date: Thu Jul 2 10:58:02 2009 -0400
509376 - add Shared Channels to side navigation of Channels tab
The Shared Channels was added to the Channels tab; however, we missed including it in the side nav. This commit adds it. I also updated the html/nav navigation, although it doesn't appear to get executed.
Also, changed "Retired channels" to "Retired Channels" to be consistent with the other channel listings available.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml index 0722a3c..4a3c858 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml @@ -260,7 +260,7 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" </trans-unit>
<trans-unit id="channel.nav.retired"> -<source>Retired channels</source> +<source>Retired Channels</source> <context-group name="ctx"> <context context-type="sourcefile">Channel Navigation Menu</context> </context-group> diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml index b5d51c7..0c9ed77 100644 --- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml +++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml @@ -115,6 +115,7 @@ <rhn-tab name="channel.nav.redhat" url="/rhn/software/channels/RedHat.do"/> <rhn-tab name="channel.nav.popular" url="/rhn/software/channels/Popular.do"/> <rhn-tab name="channel.nav.custom" url="/rhn/software/channels/Custom.do"/> + <rhn-tab name="channel.nav.shared" url="/rhn/software/channels/Shared.do"/> <rhn-tab name="channel.nav.retired" url="/rhn/software/channels/Retired.do"/> </rhn-tab> <rhn-tab name="Package Search" url="/rhn/channels/software/Search.do"> diff --git a/web/html/nav/sitenav-authenticated.xml b/web/html/nav/sitenav-authenticated.xml index ca6ee4c..332601c 100644 --- a/web/html/nav/sitenav-authenticated.xml +++ b/web/html/nav/sitenav-authenticated.xml @@ -97,7 +97,9 @@ <rhn-tab-directory>/network/software/channels</rhn-tab-directory> <rhn-tab name="All Channels" url="/rhn/software/channels/All.do"/> <rhn-tab name="Red Hat Channels" url="/rhn/software/channels/RedHat.do"/> - <rhn-tab name="Custom Channels" url="/rhn/software/channels/Custom.do"/> + <rhn-tab name="Popular Channels" url="/rhn/software/channels/Popular.do"/> + <rhn-tab name="My Channels" url="/rhn/software/channels/Custom.do"/> + <rhn-tab name="Shared Channels" url="/rhn/software/channels/Shared.do"/> <rhn-tab name="Retired Channels" url="/rhn/software/channels/Retired.do"/> </rhn-tab> <rhn-tab name="Package Search" url="/rhn/channels/software/Search.do">
commit 958ee2369ca6e72b9326b30bb3994dbbefbac8b2 Author: Brad Buckingham bbuckingham@redhat.com Date: Thu Jul 2 10:30:45 2009 -0400
509270 - clarify text on Channels -> All Channels page
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 d9b9a1f..5e4248e 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 @@ -11550,7 +11550,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro </trans-unit>
<trans-unit id="channels.all.jsp.header1"> - <source>The software channels listed below are <strong>all of the channels</strong> that your organization <a href="/rhn/channels/software/Entitlements.do">is entitled to</a> and are currently supported by Red Hat.</source> + <source>The software channels listed below are <strong>all of the channels</strong> that your organization has access to.</source> </trans-unit>
<trans-unit id="channels.redhat.jsp.header1">
commit 652bab0a00bdb3c2e51612636817c774985dd966 Author: Pradeep Kilambi pkilambi@redhat.com Date: Thu Jul 2 10:06:29 2009 -0400
509245 - only add md5sum as primary key if it does'nt already exist. This causes dup column query construction and bailing out.
diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py index b31aa7c..fdb737d 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -688,7 +688,8 @@ class Backend: tbs = self.tables['rhnPackage'] if CFG.ENABLE_NVREA: # Add md5sum as a primarykey if nevra is enabled - tbs.pk.append('md5sum') + if 'md5sum' not in tbs.pk: + tbs.pk.append('md5sum')
childTables = { 'rhnPackageProvides': 'package_id',
commit 31a6603e5d8dc2b6e919f8e8f86eadb36a629188 Author: Pradeep Kilambi pkilambi@redhat.com Date: Wed Jul 1 20:27:30 2009 -0400
some clean up and todos to work on
diff --git a/backend/satellite_tools/sync_handlers.py b/backend/satellite_tools/sync_handlers.py index 6ffbbe5..567f8ee 100644 --- a/backend/satellite_tools/sync_handlers.py +++ b/backend/satellite_tools/sync_handlers.py @@ -183,6 +183,7 @@ def import_channels(channels, orgid=None): collection = ChannelCollection() batch = [] import satCerts + orgs = map(lambda a: a['id'], satCerts.get_all_orgs()) for c in channels: try: timestamp = collection.get_channel_timestamp(c) @@ -195,19 +196,20 @@ def import_channels(channels, orgid=None): # Check to see if we're asked to sync to an orgid, # make sure the org from the export is not null org, # finally if the orgs differ so we might wanna use - # requested org's channel-family. - orgs = map(lambda a: a['id'], satCerts.get_all_orgs()) + # requested org's channel-family. + # TODO: Move these checks somewhere more appropriate if not orgid and c_obj['org_id'] is not None and \ c_obj['org_id'] not in orgs: #If the src org is not present default to org 1 - #orgid = 1 - c_obj['org_id'] = 1 - else: + orgid = 1 + + if orgid is not None and c_obj['org_id'] is not None and \ + c_obj['org_id'] != orgid: + #Only set the channel family if its a custom channel c_obj['org_id'] = orgid - #Only set the channel family if its a custom channel - if c_obj['org_id'] is not None and c_obj['org_id'] != orgid: for family in c_obj['families']: - family['label'] = 'private-channel-family-' + str(c_obj['org_id']) + family['label'] = 'private-channel-family-' + \ + str(c_obj['org_id'])
batch.append(c_obj)
commit f87886620bef29da0804cb148e7c996c5a59d5b5 Author: Mike McCune mmccune@gibson.pdx.redhat.com Date: Wed Jul 1 16:45:06 2009 -0700
509019 - adding tooltip on howto copypaste
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 7527dd8..d9b9a1f 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 @@ -9834,7 +9834,10 @@ Please note that some manual configuration of these scripts may still be require </trans-unit> <trans-unit id="kickstart.advanced.filedetails.jsp.tip.edit"> <source> Alternatively, you can upload a new version in the '{0}' section below and select '{1}'.</source> - </trans-unit> + </trans-unit> + <trans-unit id="kickstart.advanced.filedetails.jsp.tip.copypaste"> + <source> If you wish to re-use an existing Kickstart Profile we recommend you copy-paste the template from /var/lib/rhn/kickstarts instead of from your browser. This will ensure that the template variables will be preserved and the registration process will work properly after the kickstart.</source> + </trans-unit> </group> <trans-unit id="kickstartdatadelete.jsp.confirmdelete"> <source>Delete Kickstart</source> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf index e290a04..b334c36 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf @@ -74,6 +74,7 @@ arg0 = "${rhn:localize('kickstart.advanced.jsp.uploadtab')}" arg1 = "${rhn:localize(requestScope.uploadKey)}" /></rhn:tooltip> + rhn:tooltip<bean:message key="kickstart.advanced.filedetails.jsp.tip.copypaste"/></rhn:tooltip> </td> </tr> </table>
commit b3cd83ba4a828c56ef7c004e49cc6ed62a7d4867 Author: Pradeep Kilambi pkilambi@redhat.com Date: Wed Jul 1 19:28:49 2009 -0400
fixing the org id logic to take into account nul orgs
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py index 9be12e9..3c44efb 100644 --- a/backend/satellite_tools/satsync.py +++ b/backend/satellite_tools/satsync.py @@ -2007,10 +2007,11 @@ def _validate_package_org(batch): orgid = OPTIONS.orgid or None orgs = map(lambda a: a['id'], satCerts.get_all_orgs()) for pkg in batch: - if pkg['org_id'] is not None and pkg['org_id'] not in orgs: - orgid = 1 - if orgid is not None and pkg['org_id'] is not None and \ - pkg['org_id'] != orgid: + if not OPTIONS.orgid and pkg['org_id'] is not None and \ + pkg['org_id'] not in orgs: + + pkg['org_id'] = 1 + else: pkg['org_id'] = orgid
diff --git a/backend/satellite_tools/sync_handlers.py b/backend/satellite_tools/sync_handlers.py index f2488a7..6ffbbe5 100644 --- a/backend/satellite_tools/sync_handlers.py +++ b/backend/satellite_tools/sync_handlers.py @@ -197,14 +197,17 @@ def import_channels(channels, orgid=None): # finally if the orgs differ so we might wanna use # requested org's channel-family. orgs = map(lambda a: a['id'], satCerts.get_all_orgs()) - if c_obj['org_id'] is not None and c_obj['org_id'] not in orgs: + if not orgid and c_obj['org_id'] is not None and \ + c_obj['org_id'] not in orgs: #If the src org is not present default to org 1 - orgid = str(1) - if orgid is not None and c_obj['org_id'] is not None and \ - c_obj['org_id'] != orgid: + #orgid = 1 + c_obj['org_id'] = 1 + else: c_obj['org_id'] = orgid + #Only set the channel family if its a custom channel + if c_obj['org_id'] is not None and c_obj['org_id'] != orgid: for family in c_obj['families']: - family['label'] = 'private-channel-family-' + c_obj['org_id'] + family['label'] = 'private-channel-family-' + str(c_obj['org_id'])
batch.append(c_obj)
commit adcdf558ce0912ad3936bd9bb8c729768fc72301 Author: Pradeep Kilambi pkilambi@redhat.com Date: Wed Jul 1 17:56:55 2009 -0400
some clean up
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py index 41a55a8..9be12e9 100644 --- a/backend/satellite_tools/satsync.py +++ b/backend/satellite_tools/satsync.py @@ -1645,6 +1645,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation)) chunk = ss.getChunk() item_count = len(chunk) batch = self._get_cached_package_batch(chunk) + # check to make sure the orgs exported are valid _validate_package_org(batch) try: sync_handlers.import_packages(batch) @@ -1689,6 +1690,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation)) uq_packages[pid] = package
uq_pkg_data = uq_packages.values() + # check to make sure the orgs exported are valid _validate_package_org(uq_pkg_data) try: if OPTIONS.mount_point: @@ -1997,14 +1999,16 @@ def _verifyPkgRepMountPoint(): sys.exit(26)
def _validate_package_org(batch): + """Validate the orgids associated with packages. + If its redhat channel default to Null org + If custom channel and org is specified use that. + If custom and package org is not valid default to org 1 + """ orgid = OPTIONS.orgid or None orgs = map(lambda a: a['id'], satCerts.get_all_orgs()) - #if orgid is not None and orgid not in orgs: - # orgid = 1 for pkg in batch: if pkg['org_id'] is not None and pkg['org_id'] not in orgs: orgid = 1 - print "Default ORG ID",orgid if orgid is not None and pkg['org_id'] is not None and \ pkg['org_id'] != orgid: pkg['org_id'] = orgid
commit 0985d35c7b29c786346f262f109131a6c3cd5412 Author: Pradeep Kilambi pkilambi@redhat.com Date: Wed Jul 1 17:41:53 2009 -0400
509187 - Resolves the parent key constraint issue. The package org was not accounted causing constraints if the org is not on the source satellite. This fix should default the org to 1 if the org is not present for custom channels.
509194 Fixes the ISE issue on UI which is caused due to mismatched package org id.
509195 - Fixes the Channel permissions issue on UI as its was defaulting to Null org instead of org 1.
diff --git a/backend/satellite_exporter/exporter/dumper.py b/backend/satellite_exporter/exporter/dumper.py index 1f95d34..b505dea 100644 --- a/backend/satellite_exporter/exporter/dumper.py +++ b/backend/satellite_exporter/exporter/dumper.py @@ -772,6 +772,7 @@ class ShortPackagesDumper(CachedDumper, exportLib.ShortPackagesDumper): h = rhnSQL.prepare(""" select p.id, + p.org_id, pn.name, pe.evr.version version, pe.evr.release release, @@ -805,6 +806,7 @@ class PackagesDumper(CachedDumper, exportLib.PackagesDumper): select p.id, pn.name, + p.org_id, pe.evr.version version, pe.evr.release release, pe.evr.epoch epoch, diff --git a/backend/satellite_exporter/exporter/exportLib.py b/backend/satellite_exporter/exporter/exportLib.py index 3b0ce75..d0e2d82 100644 --- a/backend/satellite_exporter/exporter/exportLib.py +++ b/backend/satellite_exporter/exporter/exportLib.py @@ -544,6 +544,7 @@ class PackagesDumper(BaseDumper): select p.id, pn.name, + p.org_id, pe.evr.version version, pe.evr.release release, pe.evr.epoch epoch, @@ -592,7 +593,7 @@ class _PackageDumper(BaseRowDumper): attrs = ["name", "version", "release", "package_arch", "package_group", "rpm_version", "package_size", "payload_size", "build_host", "source_rpm", "md5sum", "payload_format", - "compat", "cookie"] + "compat", "cookie", "org_id"] attrdict = { 'id' : "rhn-package-%s" % self._row['id'], 'epoch' : self._row['epoch'] or "", @@ -684,6 +685,7 @@ class ShortPackagesDumper(BaseDumper): pe.evr.epoch epoch, pa.label package_arch, p.md5sum, + p.org_id, TO_CHAR(p.last_modified, 'YYYYMMDDHH24MISS') last_modified from rhnPackage p, rhnPackageName pn, rhnPackageEVR pe, rhnPackageArch pa @@ -700,7 +702,7 @@ class ShortPackagesDumper(BaseDumper): attributes = {} attrs = [ "id", "name", "version", "release", "epoch", - "package_arch", "md5sum", "package_size", + "package_arch", "md5sum", "package_size", "org_id", ] for attr in attrs: attributes[attr.replace('_', '-')] = data[attr] diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py index cc39ac6..41a55a8 100644 --- a/backend/satellite_tools/satsync.py +++ b/backend/satellite_tools/satsync.py @@ -876,6 +876,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
if OPTIONS.orgid is not None: nevra['org_id'] = OPTIONS.orgid + package['org_id'] = OPTIONS.orgid else: nevra['org_id'] = package['org_id']
@@ -1644,6 +1645,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation)) chunk = ss.getChunk() item_count = len(chunk) batch = self._get_cached_package_batch(chunk) + _validate_package_org(batch) try: sync_handlers.import_packages(batch) except (SQLError, SQLSchemaError, SQLConnectError), e: @@ -1686,12 +1688,13 @@ Please contact your RHN representative""" % (generation, sat_cert.generation)) package['channels'] = [channel_obj] uq_packages[pid] = package
+ uq_pkg_data = uq_packages.values() + _validate_package_org(uq_pkg_data) try: if OPTIONS.mount_point: - importer = sync_handlers.link_channel_packages(uq_packages.values(), strict=0) + importer = sync_handlers.link_channel_packages(uq_pkg_data, strict=0) else: - importer = sync_handlers.link_channel_packages(uq_packages.values()) - + importer = sync_handlers.link_channel_packages(uq_pkg_data) except (SQLError, SQLSchemaError, SQLConnectError), e: tbOut = cStringIO.StringIO() Traceback(mail=0, ostream=tbOut, with_locals=1) @@ -1993,6 +1996,19 @@ def _verifyPkgRepMountPoint(): log(-1, "ERROR: server.mount_point not set in the configuration file") sys.exit(26)
+def _validate_package_org(batch): + orgid = OPTIONS.orgid or None + orgs = map(lambda a: a['id'], satCerts.get_all_orgs()) + #if orgid is not None and orgid not in orgs: + # orgid = 1 + for pkg in batch: + if pkg['org_id'] is not None and pkg['org_id'] not in orgs: + orgid = 1 + print "Default ORG ID",orgid + if orgid is not None and pkg['org_id'] is not None and \ + pkg['org_id'] != orgid: + pkg['org_id'] = orgid +
def _getImportedChannels(): "Retrieves the channels already imported in the satellite's database" diff --git a/backend/satellite_tools/sync_handlers.py b/backend/satellite_tools/sync_handlers.py index bcaf31c..f2488a7 100644 --- a/backend/satellite_tools/sync_handlers.py +++ b/backend/satellite_tools/sync_handlers.py @@ -182,7 +182,7 @@ def get_channel_handler(): def import_channels(channels, orgid=None): collection = ChannelCollection() batch = [] - + import satCerts for c in channels: try: timestamp = collection.get_channel_timestamp(c) @@ -196,6 +196,10 @@ def import_channels(channels, orgid=None): # make sure the org from the export is not null org, # finally if the orgs differ so we might wanna use # requested org's channel-family. + orgs = map(lambda a: a['id'], satCerts.get_all_orgs()) + if c_obj['org_id'] is not None and c_obj['org_id'] not in orgs: + #If the src org is not present default to org 1 + orgid = str(1) if orgid is not None and c_obj['org_id'] is not None and \ c_obj['org_id'] != orgid: c_obj['org_id'] = orgid
commit 6faa879a0a41ee68706d18c2de7e5ec0ce84c85c Author: Brad Buckingham bbuckingham@redhat.com Date: Wed Jul 1 16:35:56 2009 -0400
509221 - System->Package->Install incorrectly using arch name vs label
The Package->Install page was using the rhnPackageArch.name to list the package architecture; however, other pages (e.g. Package->List/Remove) uses rhnPackageArch.label which is the more correct value.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml index 14459dd..9355c70 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml @@ -635,10 +635,10 @@ SELECT P.id, P.summary, PP.name as provider SELECT distinct pn.name AS NAME, pn.name || '-' || full_list.evr.version || '-' || full_list.evr.release || DECODE(full_list.evr.epoch, NULL, '', ':' || full_list.evr.epoch) AS NVRE, pn.id || '|' || lookup_evr(full_list.evr.epoch, full_list.evr.version, full_list.evr.release) || '|' || full_list.arch_id AS ID_COMBO, - full_list.arch_name as ARCH + full_list.arch_label as ARCH FROM ( SELECT p.name_id name_id, max(pe.evr) evr, - pa.name as arch_name, pa.id as arch_id + pa.label as arch_label, pa.id as arch_id FROM rhnPackageEVR PE, rhnPackage P, rhnChannelPackage CP, rhnServerChannel SC, rhnPackageArch PA @@ -647,7 +647,7 @@ SELECT distinct pn.name AS NAME, AND cp.package_id = p.id AND p.evr_id = pe.id AND p.package_arch_id = pa.id - GROUP BY p.name_id, pa.name, pa.id + GROUP BY p.name_id, pa.label, pa.id ) full_list, rhnPackageName pn INNER JOIN rhnPackage PKG ON pkg.name_id = pn.id
commit 7d334a1870252d1508a81a8001583d979b03b9aa Author: Justin Sherrill jsherril@redhat.com Date: Wed Jul 1 16:11:55 2009 -0400
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPackageProfileActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPackageProfileActionTest.java index e8a5486..d0197bb 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPackageProfileActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPackageProfileActionTest.java @@ -20,9 +20,7 @@ import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.domain.rhnpackage.profile.Profile; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.action.kickstart.KickstartPackageProfileSetupAction; -import com.redhat.rhn.frontend.dto.ProfileDto; import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; import com.redhat.rhn.manager.profile.test.ProfileManagerTest; import com.redhat.rhn.testing.RhnMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils;
commit 6238486488937c4d96e424d118912b4fee27e268 Author: Shannon Hughes shughes@redhat.com Date: Wed Jul 1 15:25:40 2009 -0400
509213 - fixed channel provider column, don't link red hat inc
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_tree_provider.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_tree_provider.jspf index 0acf500..ddd8389 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_tree_provider.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/channel/channel_tree_provider.jspf @@ -1,13 +1,20 @@ <c:choose> <c:when test="${satAdmin}"> - <rhn:column header="channels.overview.provider" - url="/rhn/admin/multiorg/OrgDetails.do?oid=${current.orgId}" - style="text-align: right;" usesRefactoredList="true"> - <c:choose> - <c:when test="${current.orgId != null}">${current.orgName}</c:when> - <c:otherwise>Red Hat, Inc.</c:otherwise> - </c:choose> - </rhn:column> + <c:choose> + <c:when test="${current.orgId != null}"> + <rhn:column header="channels.overview.provider" + url="/rhn/admin/multiorg/OrgDetails.do?oid=${current.orgId}" + style="text-align: right;" usesRefactoredList="true"> + ${current.orgName} + </rhn:column> + </c:when> + <c:otherwise> + <rhn:column header="channels.overview.provider" style="text-align: right;" + usesRefactoredList="true"> + Red Hat, Inc. + </rhn:column> + </c:otherwise> + </c:choose> </c:when> <c:otherwise> <rhn:column header="channels.overview.provider" style="text-align: right;" @@ -18,4 +25,4 @@ </c:choose> </rhn:column> </c:otherwise> -</c:choose> \ No newline at end of file +</c:choose>
commit e763c895160aaf1999cb0cc21f5159d2351ea25f Author: Brad Buckingham bbuckingham@redhat.com Date: Wed Jul 1 14:21:06 2009 -0400
509029 - schema/upgrade - update the text used for action type = kickstart_guest.initiate
The kickstart action had a value of "Initiating kickstart for Xen guest.". Since we now support kickstarting KVM guests, updating this to be generic.
diff --git a/schema/spacewalk/rhnsat/tables/rhnActionType_data.sql b/schema/spacewalk/rhnsat/tables/rhnActionType_data.sql index a3b38bd..c6b81ca 100644 --- a/schema/spacewalk/rhnsat/tables/rhnActionType_data.sql +++ b/schema/spacewalk/rhnsat/tables/rhnActionType_data.sql @@ -53,7 +53,7 @@ insert into rhnActionType values (31, 'solarispkgs.refresh_list', 'Solaris Packa insert into rhnActionType values (32, 'rhnsd.configure', 'Spacewalk Daemon Configuration','N','N'); insert into rhnActionType values (33, 'packages.verify', 'Verify deployed packages','N','N'); insert into rhnActionType values (34, 'rhn_applet.use_satellite', 'Allows for rhn-applet use with an Spacewalk','N','N'); -insert into rhnActionType values (35, 'kickstart_guest.initiate', 'Initiate a kickstart for a Xen guest.','N','Y'); +insert into rhnActionType values (35, 'kickstart_guest.initiate', 'Initiate a kickstart for a virtual guest.','N','Y'); insert into rhnActionType values (36, 'virt.shutdown', 'Shuts down a Xen domain.', 'N', 'N'); insert into rhnActionType values (37, 'virt.start', 'Starts up a Xen domain.', 'N', 'N'); insert into rhnActionType values (38, 'virt.suspend', 'Suspends a Xen domain.', 'N', 'N'); diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/123-rhnActionType_data.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/123-rhnActionType_data.sql new file mode 100644 index 0000000..347ddc2 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/123-rhnActionType_data.sql @@ -0,0 +1,21 @@ +-- +-- Copyright (c) 2008 Red Hat, Inc. +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- +-- Red Hat trademarks are not licensed under GPLv2. No permission is +-- granted to use or replicate Red Hat trademarks that are incorporated +-- in this software or its documentation. +-- +-- +-- +-- + +update rhnActionType +set name = 'Initiate a kickstart for a virtual guest.' +where label = 'kickstart_guest.initiate';
commit 8902f2c7b650b66763fc894da26497d3b4fd2652 Author: Shannon Hughes shughes@redhat.com Date: Wed Jul 1 13:48:12 2009 -0400
508859 - fixed proxy documenation links
diff --git a/web/modules/sniglets/Sniglets/AppInstall.pm b/web/modules/sniglets/Sniglets/AppInstall.pm index 4ac2672..dbaa000 100644 --- a/web/modules/sniglets/Sniglets/AppInstall.pm +++ b/web/modules/sniglets/Sniglets/AppInstall.pm @@ -76,7 +76,15 @@ sub appinstall_start {
if ($version) { my $condensed_version = condensed_proxy_version($pxt, $version); - $subst{"link"} = "/rhn/help/proxy/rhn${condensed_version}/en-US/ap-guiinstall.jsp"; + if ( grep {$condensed_version eq $_} qw/400 410 415 420 511 520/) { + $subst{"link"} = "/rhn/help/proxy/rhn${condensed_version}/en/s1-installation-install-config.jsp"; + } + elsif ( grep {$condensed_version eq $_} qw/530/) { + $subst{"link"} = "/rhn/help/proxy/rhn${condensed_version}/en-US/s1-installation-install-config.jsp"; + } + else { + $subst{"link"} = "s1-installation-install-config.jsp"; + } } else { $subst{"link"} = "s1-installation-install-config.html"; } @@ -157,7 +165,6 @@ EOQ </ul> <p> You must satisfy all the requirements before installing {app_get_name} {app_get_version}. - See the <a href="{doc_link}">{app_get_name} Documentation</a> for more details </p> <p> You should also ensure that the necessary actions are allowed on the
commit 934c39bfb1b7c3e28422aecdaa0f16fc0d56e334 Author: Mike McCune mmccune@gibson.pdx.redhat.com Date: Wed Jul 1 10:33:05 2009 -0700
508956 - fixing file preservation to actually use updated initrd.img
diff --git a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py index 5908b0e..1439c2f 100644 --- a/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py +++ b/client/tools/spacewalk-koan/spacewalkkoan/spacewalkkoan.py @@ -46,13 +46,13 @@ def initiate(kickstart_host, base, extra_append, static_device=None, system_reco k.is_virt = 0 k.is_replace = 1 k.is_display = 0 - k.profile = None + k.profile = None
if system_record != "": k.system = system_record else: k.system = None - k.port = 443 + k.port = 443 k.image = None k.live_cd = None k.virt_path = None @@ -147,26 +147,25 @@ def create_new_rd(initrd, preserve_files=[]): (err_code, err_string, dict) if problems were found """ if not initrd: - return (3, "Kickstart create new init failed: initrd not found: %s" % + return (3, "Kickstart create new init failed: initrd not found: %s" % initrd, {})
- if preserve_files: - # quota should be configurable from the UI - quota = 1000000 - # lame naming below to use /tmp/ks-tres-shadow 2X - # but needed to get it here the ks.cfg expects it - preserve_shadow = SHADOW + SHADOW - # new FileCopier class handles the dirty work of getting the - # preserved file set copied w/ all permissions, owners, etc - # kept intact and in the correct location - c = FileCopier(preserve_files, preserve_shadow, quota=quota) - try: - c.copy() - except QuotaExceeded: - return (3, "Quota of %s bytes exceeded" % quota, {}) + # quota should be configurable from the UI + quota = 1000000 + # lame naming below to use /tmp/ks-tres-shadow 2X + # but needed to get it here the ks.cfg expects it + preserve_shadow = SHADOW + SHADOW + # new FileCopier class handles the dirty work of getting the + # preserved file set copied w/ all permissions, owners, etc + # kept intact and in the correct location + c = FileCopier(preserve_files, preserve_shadow, quota=quota) + try: + c.copy() + except QuotaExceeded: + return (3, "Quota of %s bytes exceeded" % quota, {})
(status, stdout, stderr) = my_popen([ - "/usr/sbin/merge-rd.sh", initrd, initrd + ".merged", SHADOW]) + "/usr/sbin/merge-rd.sh", initrd, initrd, SHADOW]) if status: return (status, 'Error creating the new RAM disk', _build_error(status, stdout, stderr))
commit 1147de6f3feabc790c0dfe541dabdb7a4a6576bb Author: Brad Buckingham bbuckingham@redhat.com Date: Wed Jul 1 13:13:55 2009 -0400
509027 - kickstart profile edit - update length of supported kernel and post kernel options
The kernel and post kernel options that could be set from the Kickstart edit profile page would restrict the user to 64 characters for kernel and post kernel options. This was too short. In discussing with others, we decided to increase this limit to 1024 characters vs removing it entirely. This will still support a real scenario but avoid adding something entirely bogus in length.
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp index eca73ce..e8f40ae 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp @@ -71,12 +71,12 @@ </tr> <tr> <th><bean:message key="kickstartdetails.jsp.kernel_options"/></th> - <td><html:text property="kernel_options" maxlength="64" size="32" /></td> + <td><html:text property="kernel_options" maxlength="1024" size="32" /></td> </tr>
<tr> <th><bean:message key="kickstartdetails.jsp.post_kernel_options"/></th> - <td><html:text property="post_kernel_options" maxlength="64" size="32" /></td> + <td><html:text property="post_kernel_options" maxlength="1024" size="32" /></td> </tr>
<tr>
commit 93d3696df45e3267e00db4bdf23d0a8dec0e6ac2 Author: Pradeep Kilambi pkilambi@redhat.com Date: Wed Jul 1 13:02:50 2009 -0400
509181 - The config cert defaults to hosted if specified instead of master. This fix should override the hosted options when using iss settings
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py index 4504517..cc39ac6 100644 --- a/backend/satellite_tools/satsync.py +++ b/backend/satellite_tools/satsync.py @@ -2129,7 +2129,8 @@ def processCommandline(): CFG.set("ISS_PARENT", None) else: CFG.set("ISS_PARENT", OPTIONS.iss_parent or CFG.ISS_PARENT) - CFG.set("ISS_CA_CHAIN", OPTIONS.ca_cert or CFG.CA_CHAIN) + CFG.set("ISS_CA_CHAIN", OPTIONS.ca_cert or CFG.ISS_CA_CHAIN or CFG.CA_CHAIN) + CFG.set("HTTP_PROXY", OPTIONS.http_proxy or CFG.HTTP_PROXY) CFG.set("HTTP_PROXY_USERNAME", OPTIONS.http_proxy_username or CFG.HTTP_PROXY_USERNAME) CFG.set("HTTP_PROXY_PASSWORD", OPTIONS.http_proxy_password or CFG.HTTP_PROXY_PASSWORD)
commit 8ea6c8d33398b802f723d700378ae7f5c6ea5568 Author: Justin Sherrill jsherril@redhat.com Date: Wed Jul 1 11:10:07 2009 -0400
unit test fixes
diff --git a/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.java b/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.java index 140a30d..28805e7 100644 --- a/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/token/test/ActivationKeyManagerTest.java @@ -69,6 +69,11 @@ public class ActivationKeyManagerTest extends BaseTestCaseWithUser { public void testDeployConfig() throws Exception { UserTestUtils.addUserRole(user, RoleFactory.ACTIVATION_KEY_ADMIN); UserTestUtils.addProvisioning(user.getOrg()); + + //need a tools channel for config deploy + Channel base = ChannelTestUtils.createBaseChannel(user); + ChannelTestUtils.setupBaseChannelForVirtualization(user, base); + ActivationKey key = createActivationKey(); //Create a config channel ConfigChannel cc = ConfigTestUtils.createConfigChannel(user.getOrg()); @@ -85,6 +90,12 @@ public class ActivationKeyManagerTest extends BaseTestCaseWithUser { UserTestUtils.addUserRole(user, RoleFactory.ACTIVATION_KEY_ADMIN); UserTestUtils.addProvisioning(user.getOrg()); ActivationKey key = createActivationKey(); + + //need a tools channel for config deploy + Channel base = ChannelTestUtils.createBaseChannel(user); + ChannelTestUtils.setupBaseChannelForVirtualization(user, base); + + try { key.setDeployConfigs(true); fail("Permission exception not raised");
commit b942697ca20f820ffa2a95bb93886537bffd6c6e Author: Justin Sherrill jsherril@redhat.com Date: Wed Jul 1 11:01:33 2009 -0400
unit test fixes
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPackageProfileActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPackageProfileActionTest.java index 2d8d53a..e8a5486 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPackageProfileActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPackageProfileActionTest.java @@ -22,6 +22,7 @@ import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.action.kickstart.KickstartPackageProfileSetupAction; import com.redhat.rhn.frontend.dto.ProfileDto; import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; import com.redhat.rhn.manager.profile.test.ProfileManagerTest; import com.redhat.rhn.testing.RhnMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils; @@ -52,21 +53,21 @@ public class KickstartPackageProfileActionTest extends RhnMockStrutsTestCase { user.addRole(RoleFactory.ORG_ADMIN); setRequestPathInfo("/kickstart/KickstartPackageProfileEdit"); actionPerform(); - verifyPageList(ProfileDto.class); - assertNotNull(request.getAttribute(RequestContext.KICKSTART)); + assertNotNull(request.getParameter(RequestContext.KICKSTART_ID)); }
public void testSubmit() throws Exception { assertNull(ksdata.getKickstartDefaults().getProfile()); user.addRole(RoleFactory.ORG_ADMIN); Profile p = ProfileManagerTest.createProfileWithServer(user); - addSelectedItem(p.getId()); - addDispatchCall(KickstartPackageProfileSetupAction.UPDATE_METHOD); - setRequestPathInfo("/kickstart/KickstartPackageProfileEditSubmit"); + ksdata.getKickstartDefaults().setProfile(p); + addDispatchCall(KickstartPackageProfileSetupAction.CLEAR_METHOD); + setRequestPathInfo("/kickstart/KickstartPackageProfileEdit"); actionPerform(); // Gotta make sure we can update the profile to the same entry twice actionPerform(); - assertNotNull(ksdata.getKickstartDefaults().getProfile()); + ksdata = (KickstartData) TestUtils.reload(ksdata); + assertNull(ksdata.getKickstartDefaults().getProfile()); setRequestPathInfo("/kickstart/KickstartPackageProfileEdit"); // Need to test that the SetupAction works after we // add the profile to the Kickstart
commit ea7fa2349fb60049dbbf97374f838385123ee9d3 Author: Brad Buckingham bbuckingham@redhat.com Date: Wed Jul 1 09:56:58 2009 -0400
509011 - apidoc - kickstart.deleteProfile - update kslabel description
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java index b6bc18e..f376e73 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/KickstartHandler.java @@ -378,8 +378,8 @@ public class KickstartHandler extends BaseHandler { * * @xmlrpc.doc Delete a kickstart profile * @xmlrpc.param #session_key() - * @xmlrpc.param #param_desc("string", "ksLabel", "The kickstart label of - * the ip range you want to remove") + * @xmlrpc.param #param_desc("string", "ksLabel", "The label of + * the kickstart profile you want to remove") * @xmlrpc.returntype int - 1 on successful deletion, 0 if kickstart wasn't found * or couldn't be deleted. */
commit 73940695cea50986b0df4531d3df75a505c42b99 Author: Mike McCune mmccune@gibson.pdx.redhat.com Date: Tue Jun 30 19:13:45 2009 -0700
fixing method length. pulling out into private method
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java index 4f9f57e..3679640 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java +++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java @@ -283,126 +283,7 @@ public class DownloadFile extends DownloadAction { Map params = (Map) request.getAttribute(PARAMS); String type = (String) params.get(TYPE); if (type.equals(DownloadManager.DOWNLOAD_TYPE_KICKSTART)) { - path = (String) params.get(FILENAME); - if (log.isDebugEnabled()) { - log.debug("getStreamInfo KICKSTART type, path: " + path); - } - String diskPath = null; - String kickstartMount = Config.get().getString(ConfigDefaults.MOUNT_POINT); - String fileName; - KickstartSession ksession = (KickstartSession) params.get(SESSION); - KickstartSessionState newState = null; - KickstartableTree tree = (KickstartableTree) params.get(TREE); - Package rpmPackage; - if (tree.getBasePath().indexOf(kickstartMount) == 0) { - log.debug("Trimming mount because tree is" + - " explicitly rooted to the mount point"); - kickstartMount = ""; - } - // If the tree is rooted somewhere other than - // /var/satellite then no need to prepend it. - if (tree.getBasePath().startsWith("/")) { - log.debug("Tree isnt rooted at /var/satellite, lets just use basepath"); - kickstartMount = ""; - } - // Searching for RPM - if (path.endsWith(".rpm")) { - String[] split = StringUtils.split(path, '/'); - fileName = split[split.length - 1]; - if (log.isDebugEnabled()) { - log.debug("RPM filename: " + fileName); - } - Channel channel = tree.getChannel(); - rpmPackage = ChannelFactory.lookupPackageByFilename(channel, fileName); - if (rpmPackage != null) { - diskPath = Config.get().getString(ConfigDefaults.MOUNT_POINT) + "/" + - rpmPackage.getPath(); - if (log.isDebugEnabled()) { - log.debug("found package :: diskPath path: " + diskPath); - } - newState = KickstartFactory. - lookupSessionStateByLabel(KickstartSessionState.IN_PROGRESS); - } - else { - if (log.isDebugEnabled()) { - log.debug("Package was not in channel, looking in distro path."); - } - } - } - // either it's not an rpm, or we didn't find it in the channel - // check for dir pings, virt manager or install, bz #345721 - if (diskPath == null) { - // my $dp = File::Spec->catfile($kickstart_mount, $tree->base_path, $path); - diskPath = kickstartMount + "/" + tree.getBasePath() + path; - if (log.isDebugEnabled()) { - log.debug("DirCheck path: " + diskPath); - } - File actualFile = new File(diskPath); - if (actualFile.exists() && actualFile.isDirectory()) { - log.debug("Directory hit. just return 200"); - response.setContentLength(0); - response.setStatus(HttpServletResponse.SC_OK); - return getStreamForText("".getBytes()); - } - else if (actualFile.exists()) { - log.debug("Looks like it is an actual file and it exists."); - newState = KickstartFactory. - lookupSessionStateByLabel(KickstartSessionState.STARTED); - - } - else { - log.error(diskPath + " Not Found .. 404!"); - response.sendError(HttpServletResponse.SC_NOT_FOUND); - return getStreamForText("".getBytes()); - } - - } - if (log.isDebugEnabled()) { - log.debug("Final path before returning getStreamForBinary(): " + diskPath); - } - if (log.isDebugEnabled()) { - Enumeration e = request.getHeaderNames(); - while (e.hasMoreElements()) { - String name = (String) e.nextElement(); - log.debug("header: [" + name + "]: " + request.getHeader(name)); - } - } - if (request.getMethod().equals("HEAD")) { - log.debug("Method is HEAD .. serving checksum"); - return manualServeChecksum(response, diskPath); - } - else if (request.getHeader("Range") != null) { - log.debug("range detected. serving chunk of file"); - String range = request.getHeader("Range"); - return manualServeByteRange(request, response, diskPath, range); - } - // Update kickstart session - if (ksession != null) { - ksession.setState(newState); - if (ksession.getPackageFetchCount() == null) { - ksession.setPackageFetchCount(new Long(0)); - } - if (ksession.getState().getLabel().equals( - KickstartSessionState.IN_PROGRESS)) { - log.debug("Incrementing counter."); - ksession.setPackageFetchCount( - ksession.getPackageFetchCount().longValue() + 1); - ksession.setLastFileRequest(path); - } - log.debug("Saving session."); - KickstartFactory.saveKickstartSession(ksession); - } - log.debug("returning getStreamForBinary"); - - File actualFile = new File(diskPath); - Date mtime = new Date(actualFile.lastModified()); - SimpleDateFormat formatter = new SimpleDateFormat( - "EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US); - formatter.setTimeZone(TimeZone.getTimeZone("GMT")); - response.addHeader("last-modified", formatter.format(mtime)); - response.addHeader("Content-Length", String.valueOf(actualFile.length())); - log.debug("added last-modified and content-length values"); - return getStreamForBinary(diskPath); + return getStreamInfoKickstart(mapping, form, request, response, path); } else { Long fileId = (Long) params.get(FILEID); @@ -443,6 +324,133 @@ public class DownloadFile extends DownloadAction {
}
+ private StreamInfo getStreamInfoKickstart(ActionMapping mapping, ActionForm form, + HttpServletRequest request, HttpServletResponse response, + String path) throws Exception { + + Map params = (Map) request.getAttribute(PARAMS); + path = (String) params.get(FILENAME); + if (log.isDebugEnabled()) { + log.debug("getStreamInfo KICKSTART type, path: " + path); + } + String diskPath = null; + String kickstartMount = Config.get().getString(ConfigDefaults.MOUNT_POINT); + String fileName; + KickstartSession ksession = (KickstartSession) params.get(SESSION); + KickstartSessionState newState = null; + KickstartableTree tree = (KickstartableTree) params.get(TREE); + Package rpmPackage; + if (tree.getBasePath().indexOf(kickstartMount) == 0) { + log.debug("Trimming mount because tree is" + + " explicitly rooted to the mount point"); + kickstartMount = ""; + } + // If the tree is rooted somewhere other than + // /var/satellite then no need to prepend it. + if (tree.getBasePath().startsWith("/")) { + log.debug("Tree isnt rooted at /var/satellite, lets just use basepath"); + kickstartMount = ""; + } + // Searching for RPM + if (path.endsWith(".rpm")) { + String[] split = StringUtils.split(path, '/'); + fileName = split[split.length - 1]; + if (log.isDebugEnabled()) { + log.debug("RPM filename: " + fileName); + } + Channel channel = tree.getChannel(); + rpmPackage = ChannelFactory.lookupPackageByFilename(channel, fileName); + if (rpmPackage != null) { + diskPath = Config.get().getString(ConfigDefaults.MOUNT_POINT) + "/" + + rpmPackage.getPath(); + if (log.isDebugEnabled()) { + log.debug("found package :: diskPath path: " + diskPath); + } + newState = KickstartFactory. + lookupSessionStateByLabel(KickstartSessionState.IN_PROGRESS); + } + else { + if (log.isDebugEnabled()) { + log.debug("Package was not in channel, looking in distro path."); + } + } + } + // either it's not an rpm, or we didn't find it in the channel + // check for dir pings, virt manager or install, bz #345721 + if (diskPath == null) { + // my $dp = File::Spec->catfile($kickstart_mount, $tree->base_path, $path); + diskPath = kickstartMount + "/" + tree.getBasePath() + path; + if (log.isDebugEnabled()) { + log.debug("DirCheck path: " + diskPath); + } + File actualFile = new File(diskPath); + if (actualFile.exists() && actualFile.isDirectory()) { + log.debug("Directory hit. just return 200"); + response.setContentLength(0); + response.setStatus(HttpServletResponse.SC_OK); + return getStreamForText("".getBytes()); + } + else if (actualFile.exists()) { + log.debug("Looks like it is an actual file and it exists."); + newState = KickstartFactory. + lookupSessionStateByLabel(KickstartSessionState.STARTED); + + } + else { + log.error(diskPath + " Not Found .. 404!"); + response.sendError(HttpServletResponse.SC_NOT_FOUND); + return getStreamForText("".getBytes()); + } + + } + if (log.isDebugEnabled()) { + log.debug("Final path before returning getStreamForBinary(): " + diskPath); + } + if (log.isDebugEnabled()) { + Enumeration e = request.getHeaderNames(); + while (e.hasMoreElements()) { + String name = (String) e.nextElement(); + log.debug("header: [" + name + "]: " + request.getHeader(name)); + } + } + if (request.getMethod().equals("HEAD")) { + log.debug("Method is HEAD .. serving checksum"); + return manualServeChecksum(response, diskPath); + } + else if (request.getHeader("Range") != null) { + log.debug("range detected. serving chunk of file"); + String range = request.getHeader("Range"); + return manualServeByteRange(request, response, diskPath, range); + } + // Update kickstart session + if (ksession != null) { + ksession.setState(newState); + if (ksession.getPackageFetchCount() == null) { + ksession.setPackageFetchCount(new Long(0)); + } + if (ksession.getState().getLabel().equals( + KickstartSessionState.IN_PROGRESS)) { + log.debug("Incrementing counter."); + ksession.setPackageFetchCount( + ksession.getPackageFetchCount().longValue() + 1); + ksession.setLastFileRequest(path); + } + log.debug("Saving session."); + KickstartFactory.saveKickstartSession(ksession); + } + log.debug("returning getStreamForBinary"); + + File actualFile = new File(diskPath); + Date mtime = new Date(actualFile.lastModified()); + SimpleDateFormat formatter = new SimpleDateFormat( + "EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US); + formatter.setTimeZone(TimeZone.getTimeZone("GMT")); + response.addHeader("last-modified", formatter.format(mtime)); + response.addHeader("Content-Length", String.valueOf(actualFile.length())); + log.debug("added last-modified and content-length values"); + return getStreamForBinary(diskPath); + } + private StreamInfo getStreamForText(byte[] text) { ByteArrayStreamInfo stream = new ByteArrayStreamInfo("text/plain", text); return stream;
commit de8acd46871594ee326170965ad2bbf599a13b43 Author: Mike McCune mmccune@gibson.pdx.redhat.com Date: Tue Jun 30 18:40:02 2009 -0700
missed file on previous refactor commit.
diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java new file mode 100644 index 0000000..ff50c42 --- /dev/null +++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java @@ -0,0 +1,391 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.common.conf; + +import org.apache.commons.lang.StringUtils; + +import java.io.File; + +/** + * ConfigDefaults is the place to store application specific Config settings + * and convenience methods. + * + * @version $Rev$ + */ +public class ConfigDefaults { + + private static ConfigDefaults instance = new ConfigDefaults(); + + public static final String SPACEWALK = "Spacewalk"; + // + // Names of the configuration parameters + // + + public static final String SSL_AVAILABLE = "ssl_available"; + + //TODO: was private. Made public for AccessTest + public static final String WEB_SATELLITE = "web.satellite"; + + public static final String ENABLE_OAI_SYNC = "enable_oai_sync"; + public static final String SYSTEM_CHECKIN_THRESHOLD = "web.system_checkin_threshold"; + public static final String WEB_ALLOW_PXT_PERSONALITIES = "web.allow_pxt_personalities"; + public static final String WEB_DEFAULT_MAIL_FROM = "web.default_mail_from"; + public static final String WEB_ENCRYPTED_PASSWORDS = "web.encrypted_passwords"; + public static final String WEB_L10N_RESOURCEBUNDLES = "web.l10n_resourcebundles"; + public static final String WEB_PAM_AUTH_SERVICE = "web.pam_auth_service"; + public static final String WEB_SESSION_DATABASE_LIFETIME = + "web.session_database_lifetime"; + + public static final String WEB_SESSION_SECRET_1 = "web.session_secret_1"; + public static final String WEB_SESSION_SECRET_2 = "web.session_secret_2"; + public static final String WEB_SESSION_SECRET_3 = "web.session_secret_3"; + public static final String WEB_SESSION_SECRET_4 = "web.session_secret_4"; + + public static final String WEB_SESSION_SWAP_SECRET_1 = "web.session_swap_secret_1"; + public static final String WEB_SESSION_SWAP_SECRET_2 = "web.session_swap_secret_2"; + public static final String WEB_SESSION_SWAP_SECRET_3 = "web.session_swap_secret_3"; + public static final String WEB_SESSION_SWAP_SECRET_4 = "web.session_swap_secret_4"; + + public static final String WEB_SMTP_SERVER = "web.smtp_server"; + public static final String TASKOMATIC_TASKS = "taskomatic.tasks"; + public static final String TASKOMATIC_DEFAULT_TASKS = "taskomatic.default_tasks"; + public static final String ERRATA_CACHE_COMPUTE_THRESHOLD + = "errata_cache_compute_threshold"; + + public static final String DOWNLOAD_URL_LIFETIME = "download_url_lifetime"; + + public static final String NON_EXPIRABLE_PACKAGE_URLS = "non_expirable_package_urls"; + + public static final String WEB_IS_MONITORING_SCOUT = "web.is_monitoring_scout"; + + public static final String WEB_IS_MONITORING_BACKEND = "web.is_monitoring_backend"; + + public static final String SATELLITE_PARENT = "server.satellite.rhn_parent"; + + public static final String JABBER_SERVER = "server.jabber_server"; + + public static final String WEB_SCOUT_SHARED_KEY = "monitoring.scout_shared_key"; + + public static final String GPG_KEYRING = "web.gpg_keyring"; + + public static final String OVAL_MOUNT_POINT = "web.oval_mount_point"; + + public static final String KICKSTART_HOST = "kickstart_host"; + + public static final String CONFIG_REVISION_MAX_SIZE = "web.maximum_config_file_size"; + + public static final String WEB_EXCLUDED_COUNTRIES = "web.excluded_countries"; + + public static final String DISCONNECTED = "disconnected"; + + public static final String DEFAULT_SAT_PARENT = "satellite.rhn.redhat.com"; + + public static final String TINY_URL_TIMEOUT = "server.satellite.tiny_url_timeout"; + + public static final String FORCE_UNENTITLEMENT = "web.force_unentitlement"; + + public static final String PRODUCT_NAME = "web.product_name"; + + public static final String COBBLER_AUTOMATED_USER = "web.taskomatic_cobbler_user"; + + public static final String DOC_REFERENCE_GUIDE = "docs.reference_guide"; + public static final String DOC_INSTALL_GUIDE = "docs.install_guide"; + public static final String DOC_PROXY_GUIDE = "docs.proxy_guide"; + public static final String DOC_CLIENT_CONFIG_GUIDE = "docs.client_config_guide"; + public static final String DOC_CHANNEL_MGMT_GUIDE = "docs.channel_mgmt_guide"; + public static final String DOC_RELEASE_NOTES = "docs.release_notes"; + public static final String DOC_PROXY_RELEASE_NOTES = "docs.proxy_release_notes"; + + public static final String WEB_SUBSCRIBE_PROXY_CHANNEL = "web.subscribe_proxy_channel"; + + public static final String TAKE_SNAPSHOTS = "enable_snapshots"; + + /** + * The default maximum size for config revisions, (128 K) + */ + public static final int DEFAULT_CONFIG_REVISION_MAX_SIZE = 131072; + + public static final String REPOMD_PATH_PREFIX = "taskomatic.repomd_path_prefix"; + + public static final String REPOMD_CACHE_MOUNT_POINT = "repomd_cache_mount_point"; + + + public static final String DEFAULT_KICKSTART_PACKAGE_NAME = "spacewalk-koan"; + public static final String KICKSTART_PACKAGE_NAME = "kickstart_package"; + + public static final String MOUNT_POINT = "mount_point"; + public static final String KICKSTART_MOUNT_POINT = "kickstart_mount_point"; + + public static final String PAGE_SIZES = "web.page_sizes"; + public static final String DEFAULT_PAGE_SIZE = "web.default_page_size"; + + public static final String KICKSTART_COBBLER_DIR = "kickstart.cobbler.dir"; + public static final String COBBLER_SNIPPETS_DIR = "cobbler.snippets.dir"; + private static final String DEFAULT_COBBLER_SNIPPET_DIR = "/var/lib/cobbler/snippets"; + + public static final String VIRT_PATH_DIR = "kickstart.virt_storage_path"; + private static final String DEFAULT_VIRT_PATH = "/var/lib/libvirt/images"; + public static final String VIRT_BRIDGE = "kickstart.virt_bridge"; + public static final String VIRT_MEM = "kickstart.virt_mem_size_mb"; + public static final String VIRT_CPU = "kickstart.virt_cpus"; + public static final String VIRT_DISK = "kickstart.virt_disk_size_gb"; + + private ConfigDefaults() { + } + + /** + * Get instance of ConfigDefaults. + * @return ConfigDefaults instance. + */ + public static ConfigDefaults get() { + return instance; + } + + /** + * Return the kickstart mount point directory + * Note the mount point is guaranteed to have a + * '/' at the end of the string so you can use it + * for appending sub directories. + * @return the ks mount point directory. + */ + public String getKickstartMountPoint() { + String mount = StringUtils.defaultIfEmpty( + Config.get().getString(KICKSTART_MOUNT_POINT), + Config.get().getString(MOUNT_POINT)).trim(); + if (!mount.endsWith("/")) { + mount = mount + "/"; + } + return mount; + } + + + /** + * Returns the default kickstart package name + * @return the default kickstart package name + */ + public String getKickstartPackageName() { + return StringUtils.defaultIfEmpty(Config.get().getString(KICKSTART_PACKAGE_NAME), + DEFAULT_KICKSTART_PACKAGE_NAME).trim(); + } + + /** + * Get the user string for use with authorization between Spacewalk + * and Cobbler if there is no actual user in context. + * + * @return String from our config + */ + public String getCobblerAutomatedUser() { + return Config.get().getString(COBBLER_AUTOMATED_USER, "taskomatic_user"); + } + + /** + * Returns all the available page sizes. + * Note this is only meant to check + * if the web.page_sizes config entry is set + * you might want to use PageSizeDecorator.getPageSizes instead. + * @see com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator + * for more info. + * @return the comma separated list of page sizes or "". + */ + public String getPageSizes() { + return Config.get().getString(PAGE_SIZES, ""); + } + + /** + * Returns the default page size config entry. + * Note this is only meant to check + * if the web.default_page_size config entry is set + * you might want to use PageSizeDecorator.getDefaultPageSize instead. + * @see com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator + * for more info. + * @return the default page size config entry or "". + */ + public String getDefaultPageSize() { + return Config.get().getString(DEFAULT_PAGE_SIZE, ""); + } + + /** + * Returns the directory which hosts all the + * cobbler kickstart .cfg files.. + * All the .cfg files that have been generated + * by spacewalk will be either at + * ${kickstart.cobbler.dir}/wizard or + * ${kickstart.cobbler.dir}/upload + * @return the dir which has the kickstarts + */ + public String getKickstartConfigDir() { + return Config.get().getString(KICKSTART_COBBLER_DIR, "/var/lib/rhn/kickstarts/"); + } + + /** + * Returns the directory which hosts all the + * org specific cobbler snippets files.. + * All the snippet files that have been generated + * by spacewalk will be at + * /var/lib/cobbler/snippets + * + * @return the dir which has the kickstarts cobbler snippets + */ + public String getCobblerSnippetsDir() { + return Config.get().getString(COBBLER_SNIPPETS_DIR, DEFAULT_COBBLER_SNIPPET_DIR); + } + + /** + * Returns the base directory where the virt artifacts will be stored. + * This information is used while setting up system records and so on.. + * @return the virt path.. + */ + public File getVirtPath() { + return new File(Config.get().getString(VIRT_PATH_DIR, DEFAULT_VIRT_PATH)); + } + + /** + * Returns the default value for the xen virt bridge + * @return the value for virt bridge. + */ + public String getDefaultXenVirtBridge() { + return Config.get().getString(VIRT_BRIDGE, "xenbr0"); + } + + /** + * Returns the default value for the xen virt bridge + * @return the value for virt bridge. + */ + public String getDefaultKVMVirtBridge() { + return Config.get().getString(VIRT_BRIDGE, "virbr0"); + } + + + /** + * Returns the default virt disk size in GBs + * @return the virt disk size + */ + public int getDefaultVirtDiskSize() { + return Config.get().getInt(VIRT_DISK, 3); + } + + /** + * Returns the defualt VirtMemory Size in MBs + * @return the memory size + */ + public int getDefaultVirtMemorySize() { + return Config.get().getInt(VIRT_MEM, 512); + } + + /** + * Returns the default number of virt cpus + * @return the number of virt cpus + */ + public int getDefaultVirtCpus() { + return Config.get().getInt(VIRT_CPU, 1); + } + + + /** + * Check to see if monitoring scout functionality is enabled + * + * @return true if scout is enabled + */ + public boolean isMonitoringScout() { + return Config.get().getBoolean(WEB_IS_MONITORING_SCOUT); + } + + /** + * Check to see if monitoring backend functionality is enabled + * + * @return true if backend is enabled + */ + public boolean isMonitoringBackend() { + return Config.get().getBoolean(WEB_IS_MONITORING_BACKEND); + } + + /** + * Return <code>true</code> if SSL is available for web traffic. + * + * @return <code>true</code> if SSL is available for web traffic. + */ + public boolean isSSLAvailable() { + return Config.get().getBoolean(SSL_AVAILABLE); + } + + /** + * + * @return if we should force unentitlement of systems + * when setting entitlements below current usage for multiorg + */ + public boolean forceUnentitlement() { + return Config.get().getBoolean(FORCE_UNENTITLEMENT); + } + + /** + * Check if this Sat is disconnected or not + * @return boolean if this sat is disconnected or not + */ + public boolean isDisconnected() { + return (Config.get().getString(SATELLITE_PARENT) != null); + } + + /** + * Get the configured hostname for this RHN Server. + * @return String hostname + */ + public String getHostname() { + return Config.get().getString(JABBER_SERVER); + } + + /** + * Returns the URL for the search server, if not defined returns + * http://localhost:2828/RPC2 + * @return the URL for the search server. + */ + public String getSearchServerUrl() { + String searchServerHost = + Config.get().getString("search_server.host", "localhost"); + int searchServerPort = Config.get().getInt("search_server.port", 2828); + return "http://" + searchServerHost + ":" + searchServerPort + "/RPC2"; + } + + /** + * Get the URL to the cobbler server + * @return http url + */ + public String getCobblerServerUrl() { + String cobblerServer = getCobblerHost(); + int cobblerServerPort = Config.get().getInt("cobbler.port", 80); + return "http://" + cobblerServer + ":" + cobblerServerPort; + } + + + /** + * Get just the cobbler hostname + * @return the cobbler hostname + */ + public String getCobblerHost() { + return Config.get().getString("cobbler.host", "localhost"); + } + + + /** + * Return true if this is a Spacewalk instance. (as opposed to Satellite) + * @return true is this is a Spacewalk instance. + */ + public boolean isSpacewalk() { + if (Config.get().getString(PRODUCT_NAME).equals(SPACEWALK)) { + return true; + } + return false; + } + +}
commit 324710938a74f6f02e6722a9f77ed5990c023d9a Author: Mike McCune mmccune@gibson.pdx.redhat.com Date: Tue Jun 30 18:31:50 2009 -0700
refactor config constants to their own class with statics and methods.
See:
https://www.redhat.com/archives/spacewalk-devel/2009-June/msg00028.html
for more information on this refactor.
diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/code/src/com/redhat/rhn/common/conf/Config.java index 04b5947..3386157 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -45,7 +45,7 @@ public class Config {
private static Logger logger = Logger.getLogger(Config.class);
- public static final String SPACEWALK = "Spacewalk"; +
// // Location of config files @@ -67,119 +67,7 @@ public class Config { * List of values that are considered true, ignoring case. */ private static final String[] TRUE_VALUES = {"1", "y", "true", "yes", "on"}; - // - // Names of the configuration parameters - // - - public static final String SSL_AVAILABLE = "ssl_available"; - - //TODO: was private. Made public for AccessTest - public static final String WEB_SATELLITE = "web.satellite"; - - public static final String ENABLE_OAI_SYNC = "enable_oai_sync"; - public static final String SYSTEM_CHECKIN_THRESHOLD = "web.system_checkin_threshold"; - public static final String WEB_ALLOW_PXT_PERSONALITIES = "web.allow_pxt_personalities"; - public static final String WEB_DEFAULT_MAIL_FROM = "web.default_mail_from"; - public static final String WEB_ENCRYPTED_PASSWORDS = "web.encrypted_passwords"; - public static final String WEB_L10N_RESOURCEBUNDLES = "web.l10n_resourcebundles"; - public static final String WEB_PAM_AUTH_SERVICE = "web.pam_auth_service"; - public static final String WEB_SESSION_DATABASE_LIFETIME = - "web.session_database_lifetime"; - - public static final String WEB_SESSION_SECRET_1 = "web.session_secret_1"; - public static final String WEB_SESSION_SECRET_2 = "web.session_secret_2"; - public static final String WEB_SESSION_SECRET_3 = "web.session_secret_3"; - public static final String WEB_SESSION_SECRET_4 = "web.session_secret_4"; - - public static final String WEB_SESSION_SWAP_SECRET_1 = "web.session_swap_secret_1"; - public static final String WEB_SESSION_SWAP_SECRET_2 = "web.session_swap_secret_2"; - public static final String WEB_SESSION_SWAP_SECRET_3 = "web.session_swap_secret_3"; - public static final String WEB_SESSION_SWAP_SECRET_4 = "web.session_swap_secret_4"; - - public static final String WEB_SMTP_SERVER = "web.smtp_server"; - public static final String TASKOMATIC_TASKS = "taskomatic.tasks"; - public static final String TASKOMATIC_DEFAULT_TASKS = "taskomatic.default_tasks"; - public static final String ERRATA_CACHE_COMPUTE_THRESHOLD - = "errata_cache_compute_threshold"; - - public static final String DOWNLOAD_URL_LIFETIME = "download_url_lifetime"; - - public static final String NON_EXPIRABLE_PACKAGE_URLS = "non_expirable_package_urls"; - - public static final String WEB_IS_MONITORING_SCOUT = "web.is_monitoring_scout"; - - public static final String WEB_IS_MONITORING_BACKEND = "web.is_monitoring_backend"; - - public static final String SATELLITE_PARENT = "server.satellite.rhn_parent"; - - public static final String JABBER_SERVER = "server.jabber_server"; - - public static final String WEB_SCOUT_SHARED_KEY = "monitoring.scout_shared_key"; - - public static final String GPG_KEYRING = "web.gpg_keyring"; - - public static final String MOUNT_POINT = "mount_point"; - - public static final String KICKSTART_MOUNT_POINT = "kickstart_mount_point"; - - public static final String KICKSTART_PACKAGE_NAME = "kickstart_packaget"; - - public static final String DEFAULT_KICKSTART_PACKAGE_NAME = "spacewalk-koan"; - - public static final String OVAL_MOUNT_POINT = "web.oval_mount_point"; - - public static final String KICKSTART_HOST = "kickstart_host"; - - public static final String CONFIG_REVISION_MAX_SIZE = "web.maximum_config_file_size";
- public static final String WEB_EXCLUDED_COUNTRIES = "web.excluded_countries"; - - public static final String DISCONNECTED = "disconnected"; - - public static final String DEFAULT_SAT_PARENT = "satellite.rhn.redhat.com"; - - public static final String TINY_URL_TIMEOUT = "server.satellite.tiny_url_timeout"; - - public static final String FORCE_UNENTITLEMENT = "web.force_unentitlement"; - - public static final String PRODUCT_NAME = "web.product_name"; - - public static final String COBBLER_AUTOMATED_USER = "web.taskomatic_cobbler_user"; - - public static final String DOC_REFERENCE_GUIDE = "docs.reference_guide"; - public static final String DOC_INSTALL_GUIDE = "docs.install_guide"; - public static final String DOC_PROXY_GUIDE = "docs.proxy_guide"; - public static final String DOC_CLIENT_CONFIG_GUIDE = "docs.client_config_guide"; - public static final String DOC_CHANNEL_MGMT_GUIDE = "docs.channel_mgmt_guide"; - public static final String DOC_RELEASE_NOTES = "docs.release_notes"; - public static final String DOC_PROXY_RELEASE_NOTES = "docs.proxy_release_notes"; - - public static final String WEB_SUBSCRIBE_PROXY_CHANNEL = "web.subscribe_proxy_channel"; - - public static final String TAKE_SNAPSHOTS = "enable_snapshots"; - - /** - * The default maximum size for config revisions, (128 K) - */ - public static final int DEFAULT_CONFIG_REVISION_MAX_SIZE = 131072; - - public static final String REPOMD_PATH_PREFIX = "taskomatic.repomd_path_prefix"; - - public static final String REPOMD_CACHE_MOUNT_POINT = "repomd_cache_mount_point"; - - public static final String PAGE_SIZES = "web.page_sizes"; - public static final String DEFAULT_PAGE_SIZE = "web.default_page_size"; - - public static final String KICKSTART_COBBLER_DIR = "kickstart.cobbler.dir"; - public static final String COBBLER_SNIPPETS_DIR = "cobbler.snippets.dir"; - private static final String DEFAULT_COBBLER_SNIPPET_DIR = "/var/lib/cobbler/snippets"; - - public static final String VIRT_PATH_DIR = "kickstart.virt_storage_path"; - private static final String DEFAULT_VIRT_PATH = "/var/lib/libvirt/images"; - public static final String VIRT_BRIDGE = "kickstart.virt_bridge"; - public static final String VIRT_MEM = "kickstart.virt_mem_size_mb"; - public static final String VIRT_CPU = "kickstart.virt_cpus"; - public static final String VIRT_DISK = "kickstart.virt_disk_size_gb"; /** * array of prefix in the order they should be search * if the given lookup string is without a namespace. @@ -594,237 +482,4 @@ public class Config { } return prop; } - - /** - * Check to see if monitoring scout functionality is enabled - * - * @return true if scout is enabled - */ - public boolean isMonitoringScout() { - return getBoolean(WEB_IS_MONITORING_SCOUT); - } - - /** - * Check to see if monitoring backend functionality is enabled - * - * @return true if backend is enabled - */ - public boolean isMonitoringBackend() { - return getBoolean(WEB_IS_MONITORING_BACKEND); - } - - /** - * Return <code>true</code> if SSL is available for web traffic. - * - * @return <code>true</code> if SSL is available for web traffic. - */ - public boolean isSSLAvailable() { - return getBoolean(SSL_AVAILABLE); - } - - /** - * - * @return if we should force unentitlement of systems - * when setting entitlements below current usage for multiorg - */ - public boolean forceUnentitlement() { - return getBoolean(FORCE_UNENTITLEMENT); - } - - /** - * Check if this Sat is disconnected or not - * @return boolean if this sat is disconnected or not - */ - public boolean isDisconnected() { - return (this.getString(SATELLITE_PARENT) != null); - } - - /** - * Get the configured hostname for this RHN Server. - * @return String hostname - */ - public String getHostname() { - return this.getString(JABBER_SERVER); - } - - /** - * Returns the URL for the search server, if not defined returns - * http://localhost:2828/RPC2 - * @return the URL for the search server. - */ - public String getSearchServerUrl() { - String searchServerHost = - getString("search_server.host", "localhost"); - int searchServerPort = getInt("search_server.port", 2828); - return "http://" + searchServerHost + ":" + searchServerPort + "/RPC2"; - } - - /** - * Get the URL to the cobbler server - * @return http url - */ - public String getCobblerServerUrl() { - String cobblerServer = getCobblerHost(); - int cobblerServerPort = getInt("cobbler.port", 80); - return "http://" + cobblerServer + ":" + cobblerServerPort; - } - - - /** - * Get just the cobbler hostname - * @return the cobbler hostname - */ - public String getCobblerHost() { - return getString("cobbler.host", "localhost"); - } - - - /** - * Return true if this is a Spacewalk instance. (as opposed to Satellite) - * @return true is this is a Spacewalk instance. - */ - public boolean isSpacewalk() { - if (getString(PRODUCT_NAME).equals(SPACEWALK)) { - return true; - } - return false; - } - - /** - * Return the kickstart mount point directory - * Note the mount point is guaranteed to have a - * '/' at the end of the string so you can use it - * for appending sub directories. - * @return the ks mount point directory. - */ - public String getKickstartMountPoint() { - String mount = StringUtils.defaultIfEmpty(getString(KICKSTART_MOUNT_POINT), - getString(MOUNT_POINT)).trim(); - if (!mount.endsWith("/")) { - mount = mount + "/"; - } - return mount; - } - - - /** - * Returns the default kickstart package name - * @return the default kickstart package name - */ - public String getKickstartPackageName() { - return StringUtils.defaultIfEmpty(getString(KICKSTART_PACKAGE_NAME), - DEFAULT_KICKSTART_PACKAGE_NAME).trim(); - } - - /** - * Get the user string for use with authorization between Spacewalk - * and Cobbler if there is no actual user in context. - * - * @return String from our config - */ - public String getCobblerAutomatedUser() { - return getString(Config.COBBLER_AUTOMATED_USER, "taskomatic_user"); - } - - /** - * Returns all the available page sizes. - * Note this is only meant to check - * if the web.page_sizes config entry is set - * you might want to use PageSizeDecorator.getPageSizes instead. - * @see com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator - * for more info. - * @return the comma separated list of page sizes or "". - */ - public String getPageSizes() { - return getString(PAGE_SIZES, ""); - } - - /** - * Returns the default page size config entry. - * Note this is only meant to check - * if the web.default_page_size config entry is set - * you might want to use PageSizeDecorator.getDefaultPageSize instead. - * @see com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator - * for more info. - * @return the default page size config entry or "". - */ - public String getDefaultPageSize() { - return getString(DEFAULT_PAGE_SIZE, ""); - } - - /** - * Returns the directory which hosts all the - * cobbler kickstart .cfg files.. - * All the .cfg files that have been generated - * by spacewalk will be either at - * ${kickstart.cobbler.dir}/wizard or - * ${kickstart.cobbler.dir}/upload - * @return the dir which has the kickstarts - */ - public String getKickstartConfigDir() { - return getString(KICKSTART_COBBLER_DIR, "/var/lib/rhn/kickstarts/"); - } - - /** - * Returns the directory which hosts all the - * org specific cobbler snippets files.. - * All the snippet files that have been generated - * by spacewalk will be at - * /var/lib/cobbler/snippets - * - * @return the dir which has the kickstarts cobbler snippets - */ - public String getCobblerSnippetsDir() { - return getString(COBBLER_SNIPPETS_DIR, DEFAULT_COBBLER_SNIPPET_DIR); - } - - /** - * Returns the base directory where the virt artifacts will be stored. - * This information is used while setting up system records and so on.. - * @return the virt path.. - */ - public File getVirtPath() { - return new File(getString(VIRT_PATH_DIR, DEFAULT_VIRT_PATH)); - } - - /** - * Returns the default value for the xen virt bridge - * @return the value for virt bridge. - */ - public String getDefaultXenVirtBridge() { - return getString(VIRT_BRIDGE, "xenbr0"); - } - - /** - * Returns the default value for the xen virt bridge - * @return the value for virt bridge. - */ - public String getDefaultKVMVirtBridge() { - return getString(VIRT_BRIDGE, "virbr0"); - } - - - /** - * Returns the default virt disk size in GBs - * @return the virt disk size - */ - public int getDefaultVirtDiskSize() { - return getInt(VIRT_DISK, 3); - } - - /** - * Returns the defualt VirtMemory Size in MBs - * @return the memory size - */ - public int getDefaultVirtMemorySize() { - return getInt(VIRT_MEM, 512); - } - - /** - * Returns the default number of virt cpus - * @return the number of virt cpus - */ - public int getDefaultVirtCpus() { - return getInt(VIRT_CPU, 1); - } } diff --git a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java index 791f5fc..f40697e 100644 --- a/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java +++ b/java/code/src/com/redhat/rhn/common/localization/LocalizationService.java @@ -15,6 +15,7 @@ package com.redhat.rhn.common.localization;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; @@ -96,7 +97,7 @@ public class LocalizationService {
// Get the list of configured classnames from the config file. String[] packages = Config.get().getStringArray( - Config.WEB_L10N_RESOURCEBUNDLES); + ConfigDefaults.WEB_L10N_RESOURCEBUNDLES); for (int i = 0; i < packages.length; i++) { addKeysToMap(packages[i]); } @@ -537,7 +538,7 @@ public class LocalizationService { List validCountries = new LinkedList(Arrays.asList(Locale .getISOCountries())); String[] excluded = Config.get().getStringArray( - Config.WEB_EXCLUDED_COUNTRIES); + ConfigDefaults.WEB_EXCLUDED_COUNTRIES); if (excluded != null) { validCountries.removeAll(new LinkedList(Arrays.asList(excluded))); } diff --git a/java/code/src/com/redhat/rhn/common/messaging/ActionExecutor.java b/java/code/src/com/redhat/rhn/common/messaging/ActionExecutor.java index 88c5132..f5448a5 100644 --- a/java/code/src/com/redhat/rhn/common/messaging/ActionExecutor.java +++ b/java/code/src/com/redhat/rhn/common/messaging/ActionExecutor.java @@ -14,12 +14,12 @@ */ package com.redhat.rhn.common.messaging;
+import org.apache.log4j.Logger; + import java.util.ArrayList; import java.util.Iterator; import java.util.List;
-import org.apache.log4j.Logger; - /** * Utility class which encapsulates the logic necessary to dispatch actions * diff --git a/java/code/src/com/redhat/rhn/common/messaging/SmtpMail.java b/java/code/src/com/redhat/rhn/common/messaging/SmtpMail.java index fd4523a..688cdf0 100644 --- a/java/code/src/com/redhat/rhn/common/messaging/SmtpMail.java +++ b/java/code/src/com/redhat/rhn/common/messaging/SmtpMail.java @@ -16,6 +16,7 @@ package com.redhat.rhn.common.messaging;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults;
import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; @@ -63,8 +64,8 @@ public class SmtpMail implements Mail { Config.get().getStringArray("web.restrict_mail_domains");
Config c = Config.get(); - smtpHost = c.getString(Config.WEB_SMTP_SERVER, "localhost"); - String from = c.getString(Config.WEB_DEFAULT_MAIL_FROM); + smtpHost = c.getString(ConfigDefaults.WEB_SMTP_SERVER, "localhost"); + String from = c.getString(ConfigDefaults.WEB_DEFAULT_MAIL_FROM);
// Get system properties Properties props = System.getProperties(); diff --git a/java/code/src/com/redhat/rhn/common/security/PermissionException.java b/java/code/src/com/redhat/rhn/common/security/PermissionException.java index 1168c41..4f89bc7 100644 --- a/java/code/src/com/redhat/rhn/common/security/PermissionException.java +++ b/java/code/src/com/redhat/rhn/common/security/PermissionException.java @@ -20,6 +20,7 @@ package com.redhat.rhn.common.security;
import com.redhat.rhn.common.RhnRuntimeException; import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.role.Role; import com.redhat.rhn.frontend.html.HtmlTag; @@ -86,7 +87,7 @@ public class PermissionException extends RhnRuntimeException { addReason(ol, "permission.jsp.summary.acl.reason1", null);
//The second reason gives the minutes for a login session to expire. - int seconds = Config.get().getInt(Config.WEB_SESSION_DATABASE_LIFETIME); + int seconds = Config.get().getInt(ConfigDefaults.WEB_SESSION_DATABASE_LIFETIME); Integer minutes = new Integer(seconds / 60); String loginUrl = "/"; addReason(ol, "permission.jsp.summary.acl.reason2", diff --git a/java/code/src/com/redhat/rhn/common/security/SessionSwap.java b/java/code/src/com/redhat/rhn/common/security/SessionSwap.java index 4ac0a34..bd84ea1 100644 --- a/java/code/src/com/redhat/rhn/common/security/SessionSwap.java +++ b/java/code/src/com/redhat/rhn/common/security/SessionSwap.java @@ -16,6 +16,7 @@ package com.redhat.rhn.common.security;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults;
import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -112,15 +113,15 @@ public class SessionSwap { Config c = Config.get(); StringBuffer swapKey = new StringBuffer(20);
- swapKey.append(c.getString(Config.WEB_SESSION_SWAP_SECRET_1)); + swapKey.append(c.getString(ConfigDefaults.WEB_SESSION_SWAP_SECRET_1)); swapKey.append(":"); - swapKey.append(c.getString(Config.WEB_SESSION_SWAP_SECRET_2)); + swapKey.append(c.getString(ConfigDefaults.WEB_SESSION_SWAP_SECRET_2)); swapKey.append(":"); swapKey.append(data); swapKey.append(":"); - swapKey.append(c.getString(Config.WEB_SESSION_SWAP_SECRET_3)); + swapKey.append(c.getString(ConfigDefaults.WEB_SESSION_SWAP_SECRET_3)); swapKey.append(":"); - swapKey.append(c.getString(Config.WEB_SESSION_SWAP_SECRET_4)); + swapKey.append(c.getString(ConfigDefaults.WEB_SESSION_SWAP_SECRET_4)); return computeMD5Hash(swapKey.toString()); }
@@ -163,10 +164,10 @@ public class SessionSwap { log.debug("val : " + tmp); } } - swapKey.append(c.getString(Config.WEB_SESSION_SWAP_SECRET_4)); - swapKey.append(c.getString(Config.WEB_SESSION_SWAP_SECRET_3)); - swapKey.append(c.getString(Config.WEB_SESSION_SWAP_SECRET_2)); - swapKey.append(c.getString(Config.WEB_SESSION_SWAP_SECRET_1)); + swapKey.append(c.getString(ConfigDefaults.WEB_SESSION_SWAP_SECRET_4)); + swapKey.append(c.getString(ConfigDefaults.WEB_SESSION_SWAP_SECRET_3)); + swapKey.append(c.getString(ConfigDefaults.WEB_SESSION_SWAP_SECRET_2)); + swapKey.append(c.getString(ConfigDefaults.WEB_SESSION_SWAP_SECRET_1));
String joinedText = StringUtils.join(text.iterator(), "\0");
diff --git a/java/code/src/com/redhat/rhn/common/security/acl/BaseHandler.java b/java/code/src/com/redhat/rhn/common/security/acl/BaseHandler.java index 0932101..6c214fe 100644 --- a/java/code/src/com/redhat/rhn/common/security/acl/BaseHandler.java +++ b/java/code/src/com/redhat/rhn/common/security/acl/BaseHandler.java @@ -15,6 +15,7 @@ package com.redhat.rhn.common.security.acl;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.org.OrgEntitlementType; import com.redhat.rhn.domain.user.User;
@@ -37,7 +38,7 @@ public abstract class BaseHandler implements AclHandler { protected boolean checkMonitoring(User user) { OrgEntitlementType monType = new OrgEntitlementType("rhn_monitor"); boolean retval = (user.getOrg().hasEntitlement(monType) && - Config.get().getBoolean(Config.WEB_IS_MONITORING_BACKEND)); + Config.get().getBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND)); return retval; }
diff --git a/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java b/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java index eff2231..9a5a69e 100644 --- a/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java +++ b/java/code/src/com/redhat/rhn/common/security/acl/ChannelAclHandler.java @@ -14,10 +14,6 @@ */ package com.redhat.rhn.common.security.acl;
-import java.util.HashMap; -import java.util.Map; -import java.util.Set; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; @@ -27,6 +23,10 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.user.UserManager;
+import java.util.HashMap; +import java.util.Map; +import java.util.Set; +
/** * ChannelAclHandler - implements ACLs associated with channel_detail.xml diff --git a/java/code/src/com/redhat/rhn/common/security/acl/MonitoringAclHandler.java b/java/code/src/com/redhat/rhn/common/security/acl/MonitoringAclHandler.java index 37d77d7..da6e623 100644 --- a/java/code/src/com/redhat/rhn/common/security/acl/MonitoringAclHandler.java +++ b/java/code/src/com/redhat/rhn/common/security/acl/MonitoringAclHandler.java @@ -15,6 +15,7 @@ package com.redhat.rhn.common.security.acl;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.user.User;
@@ -58,8 +59,8 @@ public class MonitoringAclHandler extends BaseHandler implements AclHandler { Map map = (Map) ctx; User user = (User) map.get("user"); return user.hasRole(RoleFactory.MONITORING_ADMIN) && ( - Config.get().getBoolean(Config.WEB_IS_MONITORING_SCOUT) || - Config.get().getBoolean(Config.WEB_IS_MONITORING_BACKEND)); + Config.get().getBoolean(ConfigDefaults.WEB_IS_MONITORING_SCOUT) || + Config.get().getBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND)); }
/** diff --git a/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.java b/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.java index 47b5c32..5cd3b55 100644 --- a/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.java +++ b/java/code/src/com/redhat/rhn/common/security/acl/PackageAclHandler.java @@ -24,12 +24,12 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.rhnpackage.PackageManager;
+import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import java.util.Map; import java.util.Set;
-import org.apache.commons.logging.LogFactory; -import org.apache.commons.logging.Log; - /** * ActivationKeyAclHandler * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/common/security/acl/SystemAclHandler.java b/java/code/src/com/redhat/rhn/common/security/acl/SystemAclHandler.java index 8f84ac5..570b429 100644 --- a/java/code/src/com/redhat/rhn/common/security/acl/SystemAclHandler.java +++ b/java/code/src/com/redhat/rhn/common/security/acl/SystemAclHandler.java @@ -14,14 +14,6 @@ */ package com.redhat.rhn.common.security.acl;
-import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.cobbler.SystemRecord; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; @@ -32,6 +24,14 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.cobbler.SystemRecord; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * SystemAclHandler * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/common/security/acl/test/AccessTest.java b/java/code/src/com/redhat/rhn/common/security/acl/test/AccessTest.java index 12680d0..492f26b 100644 --- a/java/code/src/com/redhat/rhn/common/security/acl/test/AccessTest.java +++ b/java/code/src/com/redhat/rhn/common/security/acl/test/AccessTest.java @@ -14,11 +14,6 @@ */ package com.redhat.rhn.common.security.acl.test;
-import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.WriteMode; @@ -41,6 +36,11 @@ import com.redhat.rhn.domain.user.legacy.LegacyRhnUserImpl; import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.UserTestUtils;
+import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + /** * AccessTest * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/common/security/acl/test/MonitoringAclHandlerTest.java b/java/code/src/com/redhat/rhn/common/security/acl/test/MonitoringAclHandlerTest.java index 214e6db..00aaadf 100644 --- a/java/code/src/com/redhat/rhn/common/security/acl/test/MonitoringAclHandlerTest.java +++ b/java/code/src/com/redhat/rhn/common/security/acl/test/MonitoringAclHandlerTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.common.security.acl.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.security.acl.Acl; import com.redhat.rhn.common.security.acl.MonitoringAclHandler; import com.redhat.rhn.domain.org.OrgFactory; @@ -46,17 +47,17 @@ public class MonitoringAclHandlerTest extends RhnBaseTestCase {
user.getOrg().getEntitlements() .add(OrgFactory.lookupEntitlementByLabel("rhn_monitor")); - String orig = c.getString(Config.WEB_IS_MONITORING_BACKEND); - c.setBoolean(Config.WEB_IS_MONITORING_BACKEND, "1"); + String orig = c.getString(ConfigDefaults.WEB_IS_MONITORING_BACKEND); + c.setBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND, "1"); assertFalse(acl.evalAcl(context, "show_monitoring()"));
user.addRole(RoleFactory.MONITORING_ADMIN); assertTrue(acl.evalAcl(context, "show_monitoring()"));
- c.setBoolean(Config.WEB_IS_MONITORING_BACKEND, "0"); + c.setBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND, "0"); assertFalse(acl.evalAcl(context, "show_monitoring()"));
- c.setBoolean(Config.WEB_IS_MONITORING_BACKEND, orig); + c.setBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND, orig); }
public void testOrgHasScouts() throws Exception { @@ -71,14 +72,14 @@ public class MonitoringAclHandlerTest extends RhnBaseTestCase { UserTestUtils.addMonitoring(user.getOrg()); context.put("user", user);
- String orig = c.getString(Config.WEB_IS_MONITORING_BACKEND); - c.setBoolean(Config.WEB_IS_MONITORING_BACKEND, "1"); + String orig = c.getString(ConfigDefaults.WEB_IS_MONITORING_BACKEND); + c.setBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND, "1"); assertTrue(acl.evalAcl(context, "org_has_scouts()"));
- c.setBoolean(Config.WEB_IS_MONITORING_BACKEND, "0"); + c.setBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND, "0"); assertFalse(acl.evalAcl(context, "org_has_scouts()"));
- c.setBoolean(Config.WEB_IS_MONITORING_BACKEND, orig); + c.setBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND, orig); }
diff --git a/java/code/src/com/redhat/rhn/common/translation/test/TestTranslations.java b/java/code/src/com/redhat/rhn/common/translation/test/TestTranslations.java index 096d8fb..ab7e4c2 100644 --- a/java/code/src/com/redhat/rhn/common/translation/test/TestTranslations.java +++ b/java/code/src/com/redhat/rhn/common/translation/test/TestTranslations.java @@ -17,8 +17,8 @@ package com.redhat.rhn.common.translation.test;
import com.redhat.rhn.common.translation.Translations;
-import java.util.List; import java.util.Date; +import java.util.List;
public class TestTranslations extends Translations {
diff --git a/java/code/src/com/redhat/rhn/common/util/ServletUtils.java b/java/code/src/com/redhat/rhn/common/util/ServletUtils.java index eb97990..fb73340 100644 --- a/java/code/src/com/redhat/rhn/common/util/ServletUtils.java +++ b/java/code/src/com/redhat/rhn/common/util/ServletUtils.java @@ -17,6 +17,8 @@ package com.redhat.rhn.common.util;
import com.redhat.rhn.common.RhnRuntimeException;
+import org.apache.commons.lang.StringUtils; + import java.io.UnsupportedEncodingException; import java.net.URL; import java.net.URLEncoder; @@ -27,7 +29,6 @@ import java.util.Map;
import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils;
/** * A simple class that assists with Servlet-related activities diff --git a/java/code/src/com/redhat/rhn/common/validator/DataConverter.java b/java/code/src/com/redhat/rhn/common/validator/DataConverter.java index 5949e0a..0ab8b61 100644 --- a/java/code/src/com/redhat/rhn/common/validator/DataConverter.java +++ b/java/code/src/com/redhat/rhn/common/validator/DataConverter.java @@ -14,9 +14,9 @@ */ package com.redhat.rhn.common.validator;
-import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map;
/** * <p> diff --git a/java/code/src/com/redhat/rhn/common/validator/NumericConstraint.java b/java/code/src/com/redhat/rhn/common/validator/NumericConstraint.java index 89e0b2f..ef208f2 100644 --- a/java/code/src/com/redhat/rhn/common/validator/NumericConstraint.java +++ b/java/code/src/com/redhat/rhn/common/validator/NumericConstraint.java @@ -14,10 +14,10 @@ */ package com.redhat.rhn.common.validator;
-import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.localization.LocalizationService;
import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.log4j.Logger;
/** * <p> diff --git a/java/code/src/com/redhat/rhn/common/validator/RequiredIfConstraint.java b/java/code/src/com/redhat/rhn/common/validator/RequiredIfConstraint.java index 7d7d619..3e8de24 100644 --- a/java/code/src/com/redhat/rhn/common/validator/RequiredIfConstraint.java +++ b/java/code/src/com/redhat/rhn/common/validator/RequiredIfConstraint.java @@ -14,14 +14,14 @@ */ package com.redhat.rhn.common.validator;
-import org.apache.commons.beanutils.PropertyUtils; -import org.apache.log4j.Logger; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.log4j.Logger; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map;
/** * diff --git a/java/code/src/com/redhat/rhn/common/validator/StringConstraint.java b/java/code/src/com/redhat/rhn/common/validator/StringConstraint.java index 4ee4cdc..e6192ee 100644 --- a/java/code/src/com/redhat/rhn/common/validator/StringConstraint.java +++ b/java/code/src/com/redhat/rhn/common/validator/StringConstraint.java @@ -14,13 +14,13 @@ */ package com.redhat.rhn.common.validator;
-import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.localization.LocalizationService;
-import org.apache.log4j.Logger; +import org.apache.log4j.Logger;
import java.io.UnsupportedEncodingException; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import java.util.regex.Matcher; +import java.util.regex.Pattern;
/** * <p> diff --git a/java/code/src/com/redhat/rhn/common/validator/Validator.java b/java/code/src/com/redhat/rhn/common/validator/Validator.java index b1fb766..0929c48 100644 --- a/java/code/src/com/redhat/rhn/common/validator/Validator.java +++ b/java/code/src/com/redhat/rhn/common/validator/Validator.java @@ -15,6 +15,7 @@ package com.redhat.rhn.common.validator;
import com.redhat.rhn.common.localization.LocalizationService; + import org.apache.commons.beanutils.PropertyUtils; import org.apache.log4j.Logger;
diff --git a/java/code/src/com/redhat/rhn/common/validator/ValidatorResult.java b/java/code/src/com/redhat/rhn/common/validator/ValidatorResult.java index b471d4e..5402fa7 100644 --- a/java/code/src/com/redhat/rhn/common/validator/ValidatorResult.java +++ b/java/code/src/com/redhat/rhn/common/validator/ValidatorResult.java @@ -14,8 +14,8 @@ */ package com.redhat.rhn.common.validator;
-import java.util.List; import java.util.LinkedList; +import java.util.List;
/** * <p> diff --git a/java/code/src/com/redhat/rhn/common/validator/ValidatorService.java b/java/code/src/com/redhat/rhn/common/validator/ValidatorService.java index 53b8b08..5010a99 100644 --- a/java/code/src/com/redhat/rhn/common/validator/ValidatorService.java +++ b/java/code/src/com/redhat/rhn/common/validator/ValidatorService.java @@ -14,12 +14,12 @@ */ package com.redhat.rhn.common.validator;
-import com.redhat.rhn.common.util.StringUtil; - -import org.apache.log4j.Logger; - -import java.util.Iterator; -import java.util.List; +import com.redhat.rhn.common.util.StringUtil; + +import org.apache.log4j.Logger; + +import java.util.Iterator; +import java.util.List;
/** * <p> diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java index 06d5248..aff50d6 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java @@ -14,22 +14,6 @@ */ package com.redhat.rhn.domain.channel;
-import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.log4j.Logger; -import org.hibernate.Criteria; -import org.hibernate.HibernateException; -import org.hibernate.Session; -import org.hibernate.criterion.CriteriaSpecification; -import org.hibernate.criterion.Projections; -import org.hibernate.criterion.Restrictions; - import com.redhat.rhn.common.db.datasource.CallableMode; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; @@ -43,6 +27,22 @@ import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.channel.ChannelManager;
+import org.apache.log4j.Logger; +import org.hibernate.Criteria; +import org.hibernate.HibernateException; +import org.hibernate.Session; +import org.hibernate.criterion.CriteriaSpecification; +import org.hibernate.criterion.Projections; +import org.hibernate.criterion.Restrictions; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * ChannelFactory * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java index 2e52868..7483d7c 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelVersion.java @@ -14,11 +14,11 @@ */ package com.redhat.rhn.domain.channel;
+import com.redhat.rhn.domain.kickstart.KickstartInstallType; + import java.util.HashMap; import java.util.Map;
-import com.redhat.rhn.domain.kickstart.KickstartInstallType; - /** * Simple enum class to represent the RHEL version of a channel. * ChannelVersion diff --git a/java/code/src/com/redhat/rhn/domain/channel/DistChannelMap.java b/java/code/src/com/redhat/rhn/domain/channel/DistChannelMap.java index 67cc17a..d55eedd 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/DistChannelMap.java +++ b/java/code/src/com/redhat/rhn/domain/channel/DistChannelMap.java @@ -16,9 +16,9 @@ package com.redhat.rhn.domain.channel;
import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder;
import java.io.Serializable; -import org.apache.commons.lang.builder.ToStringBuilder;
/** * DistChannelMap - Class representation of the table rhnDistChannelMap. diff --git a/java/code/src/com/redhat/rhn/domain/channel/PrivateChannelFamily.java b/java/code/src/com/redhat/rhn/domain/channel/PrivateChannelFamily.java index d41b73f..9b0f1b0 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/PrivateChannelFamily.java +++ b/java/code/src/com/redhat/rhn/domain/channel/PrivateChannelFamily.java @@ -14,13 +14,13 @@ */ package com.redhat.rhn.domain.channel;
-import java.io.Serializable; -import java.util.Date; +import com.redhat.rhn.domain.org.Org;
import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder;
-import com.redhat.rhn.domain.org.Org; +import java.io.Serializable; +import java.util.Date;
/** * PrivateChannelFamily - Class representation of the table rhnPrivateChannelFamily. diff --git a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java index ab52867..95e46d9 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ReleaseChannelMap.java @@ -14,12 +14,12 @@ */ package com.redhat.rhn.domain.channel;
+import com.redhat.rhn.common.util.DynamicComparator; + import org.apache.commons.collections.ComparatorUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder;
-import com.redhat.rhn.common.util.DynamicComparator; - import java.io.Serializable; import java.util.ArrayList; import java.util.Comparator; diff --git a/java/code/src/com/redhat/rhn/domain/channel/SelectableChannelVersion.java b/java/code/src/com/redhat/rhn/domain/channel/SelectableChannelVersion.java index 2ebb24f..efacebe 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/SelectableChannelVersion.java +++ b/java/code/src/com/redhat/rhn/domain/channel/SelectableChannelVersion.java @@ -14,11 +14,11 @@ */ package com.redhat.rhn.domain.channel;
+import com.redhat.rhn.frontend.struts.Selectable; + import java.util.ArrayList; import java.util.List;
-import com.redhat.rhn.frontend.struts.Selectable; - /** * * SelectableChannelVersion diff --git a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFamilyFactoryTest.java b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFamilyFactoryTest.java index 6802cd9..4bd69bb 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFamilyFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFamilyFactoryTest.java @@ -14,8 +14,6 @@ */ package com.redhat.rhn.domain.channel.test;
-import java.util.List; - import com.redhat.rhn.domain.channel.ChannelFamily; import com.redhat.rhn.domain.channel.ChannelFamilyFactory; import com.redhat.rhn.domain.channel.PrivateChannelFamily; @@ -25,6 +23,8 @@ import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils;
+import java.util.List; + /** * ChannelFamilyFactoryTest * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/domain/common/ArchType.java b/java/code/src/com/redhat/rhn/domain/common/ArchType.java index 1f10a05..1922909 100644 --- a/java/code/src/com/redhat/rhn/domain/common/ArchType.java +++ b/java/code/src/com/redhat/rhn/domain/common/ArchType.java @@ -14,9 +14,10 @@ */ package com.redhat.rhn.domain.common;
-import org.apache.commons.lang.builder.ToStringBuilder; import com.redhat.rhn.domain.BaseDomainHelper;
+import org.apache.commons.lang.builder.ToStringBuilder; + /** * ArchType * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigFile.java b/java/code/src/com/redhat/rhn/domain/config/ConfigFile.java index 2e055a3..932e105 100644 --- a/java/code/src/com/redhat/rhn/domain/config/ConfigFile.java +++ b/java/code/src/com/redhat/rhn/domain/config/ConfigFile.java @@ -15,6 +15,7 @@ package com.redhat.rhn.domain.config;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.BaseDomainHelper;
/** @@ -113,7 +114,7 @@ public class ConfigFile extends BaseDomainHelper { * @return config file size in bytes */ public static int getMaxFileSize() { - return Config.get().getInt(Config.CONFIG_REVISION_MAX_SIZE, - Config.DEFAULT_CONFIG_REVISION_MAX_SIZE); + return Config.get().getInt(ConfigDefaults.CONFIG_REVISION_MAX_SIZE, + ConfigDefaults.DEFAULT_CONFIG_REVISION_MAX_SIZE); } } diff --git a/java/code/src/com/redhat/rhn/domain/entitlement/Entitlement.java b/java/code/src/com/redhat/rhn/domain/entitlement/Entitlement.java index 0613e37..dd5710a 100644 --- a/java/code/src/com/redhat/rhn/domain/entitlement/Entitlement.java +++ b/java/code/src/com/redhat/rhn/domain/entitlement/Entitlement.java @@ -15,8 +15,9 @@ package com.redhat.rhn.domain.entitlement;
import com.redhat.rhn.common.localization.LocalizationService; -import org.apache.commons.lang.builder.ToStringBuilder; + import org.apache.commons.lang.builder.CompareToBuilder; +import org.apache.commons.lang.builder.ToStringBuilder;
/** * Entitlements diff --git a/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrata.java b/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrata.java index d84b6ac..e7b91fe 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrata.java +++ b/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrata.java @@ -17,8 +17,8 @@ package com.redhat.rhn.domain.errata.impl; import com.redhat.rhn.common.security.errata.PublishedOnlyException; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.errata.AbstractErrata; -import com.redhat.rhn.domain.errata.Keyword; import com.redhat.rhn.domain.errata.Cve; +import com.redhat.rhn.domain.errata.Keyword;
import java.util.Date; import java.util.HashSet; diff --git a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java index 42988a6..c309486 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/errata/test/ErrataFactoryTest.java @@ -14,13 +14,6 @@ */ package com.redhat.rhn.domain.errata.test;
-import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.common.hibernate.HibernateFactory; @@ -47,6 +40,13 @@ import com.redhat.rhn.testing.ChannelTestUtils; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils;
+import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * ErrataFactoryTest * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java index 88feacc..71bb8ae 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java @@ -15,6 +15,7 @@ package com.redhat.rhn.domain.kickstart;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.common.FileList; @@ -1282,7 +1283,7 @@ public class KickstartData { * @return String kickstart package like auto-kickstart-ks-rhel-i386-as-4 */ public String getKickstartPackageName() { - return Config.get().getKickstartPackageName(); + return ConfigDefaults.get().getKickstartPackageName();
}
@@ -1381,7 +1382,8 @@ public class KickstartData { if (getCobblerId() != null) { Profile prof = Profile.lookupById( CobblerXMLRPCHelper.getConnection( - Config.get().getString(Config.COBBLER_AUTOMATED_USER)), getCobblerId()); + Config.get().getString(ConfigDefaults.COBBLER_AUTOMATED_USER)), + getCobblerId()); if (prof != null && !StringUtils.isBlank(prof.getKickstart())) { return prof.getKickstart(); } @@ -1491,10 +1493,10 @@ public class KickstartData { public String getDefaultVirtBridge() { if (this.getKickstartDefaults().getVirtualizationType().getLabel() .equals(KickstartVirtualizationType.KVM_FULLYVIRT)) { - return Config.get().getDefaultKVMVirtBridge(); + return ConfigDefaults.get().getDefaultKVMVirtBridge(); } else { - return Config.get().getDefaultXenVirtBridge(); + return ConfigDefaults.get().getDefaultXenVirtBridge(); } }
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java index 2565a74..96702f7 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartableTree.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.domain.kickstart;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.domain.BaseDomainHelper; import com.redhat.rhn.domain.channel.Channel; @@ -250,7 +250,7 @@ public class KickstartableTree extends BaseDomainHelper { if (isRhnTree()) { //redhat channel append the mount point to //base path... - return Config.get().getKickstartMountPoint() + getBasePath(); + return ConfigDefaults.get().getKickstartMountPoint() + getBasePath(); } //its a base channel return the return getBasePath(); diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java b/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java index 279113a..3b57541 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/cobbler/CobblerSnippet.java @@ -15,7 +15,7 @@
package com.redhat.rhn.domain.kickstart.cobbler;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.util.FileUtils; import com.redhat.rhn.common.validator.ValidatorException; @@ -42,7 +42,7 @@ public class CobblerSnippet implements Comparable { * @return the cobbler snippets dir */ public static File getCobblerSnippetsDir() { - File fl = new File(Config.get().getCobblerSnippetsDir()); + File fl = new File(ConfigDefaults.get().getCobblerSnippetsDir()); return fl; }
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java index e3f966a..9681c92 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.domain.kickstart.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.common.util.FileUtils; import com.redhat.rhn.common.util.MD5Crypt; @@ -88,8 +89,9 @@ public class KickstartDataTest extends BaseTestCaseWithUser { public static void setupTestConfiguration() throws IOException { Config.get().setString(CobblerXMLRPCHelper.class.getName(), MockXMLRPCInvoker.class.getName()); - Config.get().setString(Config.KICKSTART_COBBLER_DIR, "/tmp/kickstart/"); - Config.get().setString(Config.COBBLER_SNIPPETS_DIR, "/tmp/kickstart/snippets"); + Config.get().setString(ConfigDefaults.KICKSTART_COBBLER_DIR, "/tmp/kickstart/"); + Config.get().setString(ConfigDefaults.COBBLER_SNIPPETS_DIR, + "/tmp/kickstart/snippets"); Config.get().setString(CobblerConnection.class.getName(), MockConnection.class.getName()); createKickstartDirs(); @@ -98,9 +100,9 @@ public class KickstartDataTest extends BaseTestCaseWithUser { }
public static void createKickstartDirs() throws IOException { - createDirIfNotExists(new File(Config.get().getKickstartConfigDir() + + createDirIfNotExists(new File(ConfigDefaults.get().getKickstartConfigDir() + "/" + KickstartData.WIZARD_DIR)); - createDirIfNotExists(new File(Config.get().getKickstartConfigDir() + + createDirIfNotExists(new File(ConfigDefaults.get().getKickstartConfigDir() + "/" + KickstartData.RAW_DIR)); createDirIfNotExists(CobblerSnippet.getSpacewalkSnippetsDir()); } @@ -393,7 +395,7 @@ public class KickstartDataTest extends BaseTestCaseWithUser { addPackages(c, KickstartFormatter.FRESH_PKG_NAMES_RHEL34); } PackageManagerTest.addPackageToChannel( - Config.get().getKickstartPackageName() + "testy", c); + ConfigDefaults.get().getKickstartPackageName() + "testy", c); PackageManagerTest.addPackageToChannel( KickstartData.LEGACY_KICKSTART_PACKAGE_NAME + KickstartableTreeTest.TEST_BOOT_PATH, c); @@ -764,12 +766,12 @@ public class KickstartDataTest extends BaseTestCaseWithUser { KickstartVirtualizationType.kvmGuest());
assertTrue(k.getDefaultVirtBridge().equals( - Config.get().getDefaultKVMVirtBridge())); + ConfigDefaults.get().getDefaultKVMVirtBridge()));
k.getKickstartDefaults().setVirtualizationType( KickstartVirtualizationType.xenPV());
assertTrue(k.getDefaultVirtBridge().equals( - Config.get().getDefaultXenVirtBridge())); + ConfigDefaults.get().getDefaultXenVirtBridge())); } } diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/MonitoringFactory.java b/java/code/src/com/redhat/rhn/domain/monitoring/MonitoringFactory.java index dccf432..241bfd7 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/MonitoringFactory.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/MonitoringFactory.java @@ -14,8 +14,8 @@ */ package com.redhat.rhn.domain.monitoring;
-import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.common.db.datasource.ModeFactory; +import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.monitoring.command.Command; import com.redhat.rhn.domain.monitoring.command.CommandGroup; diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/notification/ContactGroupMember.java b/java/code/src/com/redhat/rhn/domain/monitoring/notification/ContactGroupMember.java index bded49f..0657faf 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/notification/ContactGroupMember.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/notification/ContactGroupMember.java @@ -14,10 +14,11 @@ */ package com.redhat.rhn.domain.monitoring.notification;
+import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; + import java.io.Serializable; import java.util.Date; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.EqualsBuilder;
/** * ContactGroupMember - Class representation of the table rhn_contact_group_members. diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java b/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java index 337681c..c54bb9f 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java @@ -14,19 +14,19 @@ */ package com.redhat.rhn.domain.monitoring.satcluster;
-import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.Date; -import java.util.HashMap; -import java.util.List; +import com.redhat.rhn.common.hibernate.HibernateFactory; +import com.redhat.rhn.common.util.MD5Crypt; +import com.redhat.rhn.domain.user.User;
import org.apache.commons.lang.RandomStringUtils; import org.apache.log4j.Logger; import org.hibernate.Session;
-import com.redhat.rhn.common.hibernate.HibernateFactory; -import com.redhat.rhn.common.util.MD5Crypt; -import com.redhat.rhn.domain.user.User; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Date; +import java.util.HashMap; +import java.util.List;
/** * SatClusterFactory - the singleton class used to fetch and store diff --git a/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java b/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java index 30314b4..65bd07e 100644 --- a/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java +++ b/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java @@ -14,16 +14,6 @@ */ package com.redhat.rhn.domain.org;
-import java.sql.Types; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.log4j.Logger; -import org.hibernate.Session; - import com.redhat.rhn.common.db.datasource.CallableMode; import com.redhat.rhn.common.db.datasource.DataList; import com.redhat.rhn.common.db.datasource.ModeFactory; @@ -34,6 +24,16 @@ import com.redhat.rhn.domain.channel.ChannelFamily; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.ServerGroup;
+import org.apache.log4j.Logger; +import org.hibernate.Session; + +import java.sql.Types; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * A small wrapper around hibernate files to remove some of the complexities * of writing to hibernate. diff --git a/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java b/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java index ed26a7c..9af8606 100644 --- a/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java +++ b/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java @@ -15,22 +15,6 @@
package com.redhat.rhn.domain.org;
-import java.sql.Types; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.log4j.Logger; -import org.hibernate.Session; - import com.redhat.rhn.common.db.datasource.CallableMode; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; @@ -53,6 +37,22 @@ import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.entitlement.EntitlementManager;
+import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.log4j.Logger; +import org.hibernate.Session; + +import java.sql.Types; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * Class Org that reflects the DB representation of web_customer DB table: * web_customer diff --git a/java/code/src/com/redhat/rhn/domain/org/SystemMigration.java b/java/code/src/com/redhat/rhn/domain/org/SystemMigration.java index 9a93a18..97318de 100644 --- a/java/code/src/com/redhat/rhn/domain/org/SystemMigration.java +++ b/java/code/src/com/redhat/rhn/domain/org/SystemMigration.java @@ -14,15 +14,15 @@ */ package com.redhat.rhn.domain.org;
-import java.io.Serializable; -import java.util.Date; - import com.redhat.rhn.domain.server.Server;
import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder;
+import java.io.Serializable; +import java.util.Date; + /** * Class representation of the rhnSystemMigrations table * SystemMigration diff --git a/java/code/src/com/redhat/rhn/domain/org/SystemMigrationFactory.java b/java/code/src/com/redhat/rhn/domain/org/SystemMigrationFactory.java index e51d15d..b7397d7 100644 --- a/java/code/src/com/redhat/rhn/domain/org/SystemMigrationFactory.java +++ b/java/code/src/com/redhat/rhn/domain/org/SystemMigrationFactory.java @@ -14,14 +14,15 @@ */ package com.redhat.rhn.domain.org;
+import com.redhat.rhn.common.hibernate.HibernateFactory; +import com.redhat.rhn.domain.server.Server; + +import org.apache.log4j.Logger; + import java.util.HashMap; import java.util.List; import java.util.Map;
-import org.apache.log4j.Logger; -import com.redhat.rhn.common.hibernate.HibernateFactory; -import com.redhat.rhn.domain.server.Server; - /** * A small wrapper around hibernate files to remove some of the complexities * of writing to hibernate. diff --git a/java/code/src/com/redhat/rhn/domain/org/test/OrgFactoryTest.java b/java/code/src/com/redhat/rhn/domain/org/test/OrgFactoryTest.java index 3ca1882..bb01bd0 100644 --- a/java/code/src/com/redhat/rhn/domain/org/test/OrgFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/org/test/OrgFactoryTest.java @@ -15,12 +15,6 @@
package com.redhat.rhn.domain.org.test;
-import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.domain.channel.Channel; @@ -48,6 +42,12 @@ import com.redhat.rhn.testing.ServerTestUtils; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils;
+import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * JUnit test case for the Org class. * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/domain/org/test/SystemMigrationFactoryTest.java b/java/code/src/com/redhat/rhn/domain/org/test/SystemMigrationFactoryTest.java index e8b8611..14484a6 100644 --- a/java/code/src/com/redhat/rhn/domain/org/test/SystemMigrationFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/org/test/SystemMigrationFactoryTest.java @@ -14,9 +14,6 @@ */ package com.redhat.rhn.domain.org.test;
-import java.util.Date; -import java.util.LinkedList; -import java.util.List; import com.redhat.rhn.domain.org.SystemMigration; import com.redhat.rhn.domain.org.SystemMigrationFactory; import com.redhat.rhn.domain.server.Server; @@ -26,6 +23,10 @@ import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.UserTestUtils;
+import java.util.Date; +import java.util.LinkedList; +import java.util.List; + /** * SystemMigrationFactoryTest * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java index 5576d91..992cb30 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java @@ -33,11 +33,11 @@ import org.hibernate.Session; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.HashSet;
/** * PackageFactory diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/Patch.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/Patch.java index e926f05..605b06b 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/Patch.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/Patch.java @@ -14,12 +14,12 @@ */ package com.redhat.rhn.domain.rhnpackage;
+import com.redhat.rhn.domain.solaris.PatchType; + import java.sql.Blob; import java.util.Date; import java.util.Set;
-import com.redhat.rhn.domain.solaris.PatchType; - /** * * Patch diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PatchSetTest.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PatchSetTest.java index 5c75e06..a009f38 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PatchSetTest.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/test/PatchSetTest.java @@ -14,8 +14,6 @@ */ package com.redhat.rhn.domain.rhnpackage.test;
-import java.util.Date; - import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.rhnpackage.PackageArch; @@ -23,6 +21,8 @@ import com.redhat.rhn.domain.rhnpackage.PatchSet; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils;
+import java.util.Date; + /** * PatchSetTest * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/domain/role/RoleImpl.java b/java/code/src/com/redhat/rhn/domain/role/RoleImpl.java index 0bb49ae..59b1374 100644 --- a/java/code/src/com/redhat/rhn/domain/role/RoleImpl.java +++ b/java/code/src/com/redhat/rhn/domain/role/RoleImpl.java @@ -16,8 +16,9 @@ package com.redhat.rhn.domain.role;
import com.redhat.rhn.domain.BaseDomainHelper; -import org.apache.commons.lang.builder.HashCodeBuilder; + import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder;
/** * Class Role that reflects the DB representation of RHNUSERGROUP diff --git a/java/code/src/com/redhat/rhn/domain/server/InstalledPackage.java b/java/code/src/com/redhat/rhn/domain/server/InstalledPackage.java index 1b1c80c..8f0ff4d 100644 --- a/java/code/src/com/redhat/rhn/domain/server/InstalledPackage.java +++ b/java/code/src/com/redhat/rhn/domain/server/InstalledPackage.java @@ -14,10 +14,10 @@ */ package com.redhat.rhn.domain.server;
+import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PackageArch; import com.redhat.rhn.domain.rhnpackage.PackageEvr; import com.redhat.rhn.domain.rhnpackage.PackageName; -import com.redhat.rhn.domain.rhnpackage.Package;
import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java index 4df50ef..89a6780 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Server.java +++ b/java/code/src/com/redhat/rhn/domain/server/Server.java @@ -15,6 +15,7 @@ package com.redhat.rhn.domain.server;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.BaseDomainHelper; import com.redhat.rhn.domain.Identifiable; import com.redhat.rhn.domain.channel.Channel; @@ -1510,7 +1511,7 @@ public class Server extends BaseDomainHelper implements Identifiable { public boolean isInactive() { Date lastCheckin = this.getLastCheckin(); long millisInDay = (1000 * 60 * 60 * 24); - long threshold = Config.get().getInt(Config.SYSTEM_CHECKIN_THRESHOLD, 1); + long threshold = Config.get().getInt(ConfigDefaults.SYSTEM_CHECKIN_THRESHOLD, 1); Date yesterday = new Timestamp(System.currentTimeMillis() - (millisInDay * threshold)); return lastCheckin.before(yesterday); diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerSnapshot.java b/java/code/src/com/redhat/rhn/domain/server/ServerSnapshot.java index ccb4bda..4dd1dda 100644 --- a/java/code/src/com/redhat/rhn/domain/server/ServerSnapshot.java +++ b/java/code/src/com/redhat/rhn/domain/server/ServerSnapshot.java @@ -14,12 +14,6 @@ */ package com.redhat.rhn.domain.server;
-import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.apache.commons.lang.builder.HashCodeBuilder; - import com.redhat.rhn.domain.BaseDomainHelper; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.config.ConfigChannel; @@ -27,6 +21,12 @@ import com.redhat.rhn.domain.config.ConfigRevision; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.rhnpackage.PackageNevra;
+import org.apache.commons.lang.builder.HashCodeBuilder; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; + /** * * ServerSnapshot diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerSnapshotTagLink.java b/java/code/src/com/redhat/rhn/domain/server/ServerSnapshotTagLink.java index 562a22a..fba0d58 100644 --- a/java/code/src/com/redhat/rhn/domain/server/ServerSnapshotTagLink.java +++ b/java/code/src/com/redhat/rhn/domain/server/ServerSnapshotTagLink.java @@ -14,12 +14,12 @@ */ package com.redhat.rhn.domain.server;
-import java.io.Serializable; +import com.redhat.rhn.domain.BaseDomainHelper;
import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder;
-import com.redhat.rhn.domain.BaseDomainHelper; +import java.io.Serializable;
/** * diff --git a/java/code/src/com/redhat/rhn/domain/server/SnapshotTag.java b/java/code/src/com/redhat/rhn/domain/server/SnapshotTag.java index bb20a06..15bf61e 100644 --- a/java/code/src/com/redhat/rhn/domain/server/SnapshotTag.java +++ b/java/code/src/com/redhat/rhn/domain/server/SnapshotTag.java @@ -14,12 +14,12 @@ */ package com.redhat.rhn.domain.server;
-import java.util.Set; +import com.redhat.rhn.domain.BaseDomainHelper; +import com.redhat.rhn.domain.org.Org;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import com.redhat.rhn.domain.BaseDomainHelper; -import com.redhat.rhn.domain.org.Org; +import java.util.Set;
/** * CPU diff --git a/java/code/src/com/redhat/rhn/domain/server/SnapshotTagName.java b/java/code/src/com/redhat/rhn/domain/server/SnapshotTagName.java index 4295693..698d8ae 100644 --- a/java/code/src/com/redhat/rhn/domain/server/SnapshotTagName.java +++ b/java/code/src/com/redhat/rhn/domain/server/SnapshotTagName.java @@ -14,10 +14,10 @@ */ package com.redhat.rhn.domain.server;
-import org.apache.commons.lang.builder.HashCodeBuilder; - import com.redhat.rhn.domain.BaseDomainHelper;
+import org.apache.commons.lang.builder.HashCodeBuilder; + /** * CPU * @version $Rev: 118113 $ diff --git a/java/code/src/com/redhat/rhn/domain/server/test/MonitoredServerTest.java b/java/code/src/com/redhat/rhn/domain/server/test/MonitoredServerTest.java index fe0934e..033dc03 100644 --- a/java/code/src/com/redhat/rhn/domain/server/test/MonitoredServerTest.java +++ b/java/code/src/com/redhat/rhn/domain/server/test/MonitoredServerTest.java @@ -14,10 +14,6 @@ */ package com.redhat.rhn.domain.server.test;
-import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - import com.redhat.rhn.domain.monitoring.MonitoringConstants; import com.redhat.rhn.domain.monitoring.MonitoringFactory; import com.redhat.rhn.domain.monitoring.ProbeState; @@ -29,6 +25,10 @@ import com.redhat.rhn.domain.server.MonitoredServer; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.testing.BaseTestCaseWithUser;
+import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + /** * CPUTest * @version $Rev: 54534 $ diff --git a/java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceManufacturer.java b/java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceManufacturer.java index 01fb7e0..ced69df 100644 --- a/java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceManufacturer.java +++ b/java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceManufacturer.java @@ -15,8 +15,8 @@ package com.redhat.rhn.domain.server.test;
import com.redhat.rhn.domain.server.VirtualInstance; -import com.redhat.rhn.domain.server.VirtualInstanceState; import com.redhat.rhn.domain.server.VirtualInstanceFactory; +import com.redhat.rhn.domain.server.VirtualInstanceState; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.testing.TestUtils;
diff --git a/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java b/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java index 0edee1f..faae7f4 100644 --- a/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java +++ b/java/code/src/com/redhat/rhn/domain/session/WebSessionImpl.java @@ -14,12 +14,12 @@ */ package com.redhat.rhn.domain.session;
-import org.apache.log4j.Logger; - import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.manager.session.SessionManager;
+import org.apache.log4j.Logger; + /** * A web session * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java b/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java index eb5e2f6..b4c3af8 100644 --- a/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java +++ b/java/code/src/com/redhat/rhn/domain/token/ActivationKeyFactory.java @@ -30,7 +30,6 @@ import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger;
- import java.util.HashMap; import java.util.Iterator; import java.util.List; diff --git a/java/code/src/com/redhat/rhn/domain/token/TokenPackage.java b/java/code/src/com/redhat/rhn/domain/token/TokenPackage.java index 2094f98..2410bd3 100644 --- a/java/code/src/com/redhat/rhn/domain/token/TokenPackage.java +++ b/java/code/src/com/redhat/rhn/domain/token/TokenPackage.java @@ -14,14 +14,14 @@ */ package com.redhat.rhn.domain.token;
-import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; - import com.redhat.rhn.domain.Identifiable; import com.redhat.rhn.domain.rhnpackage.PackageArch; import com.redhat.rhn.domain.rhnpackage.PackageName;
+import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; + /** * TokenPackage * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/domain/token/TokenPackageFactory.java b/java/code/src/com/redhat/rhn/domain/token/TokenPackageFactory.java index 5640f50..9c2694e 100644 --- a/java/code/src/com/redhat/rhn/domain/token/TokenPackageFactory.java +++ b/java/code/src/com/redhat/rhn/domain/token/TokenPackageFactory.java @@ -14,8 +14,6 @@ */ package com.redhat.rhn.domain.token;
-import java.util.List; - import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.rhnpackage.PackageArch; import com.redhat.rhn.domain.rhnpackage.PackageName; @@ -24,6 +22,8 @@ import org.apache.log4j.Logger; import org.hibernate.HibernateException; import org.hibernate.Session;
+import java.util.List; + /** * TokenPackageFactory * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java b/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java index 6307031..18185e9 100644 --- a/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java +++ b/java/code/src/com/redhat/rhn/domain/token/test/ActivationKeyTest.java @@ -16,35 +16,24 @@ package com.redhat.rhn.domain.token.test;
import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.channel.Channel; - import com.redhat.rhn.domain.channel.test.ChannelFactoryTest; - import com.redhat.rhn.domain.entitlement.Entitlement; - import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.KickstartSession; - import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.domain.kickstart.test.KickstartSessionTest; - import com.redhat.rhn.domain.role.RoleFactory; - import com.redhat.rhn.domain.server.ManagedServerGroup; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerConstants; import com.redhat.rhn.domain.server.ServerGroup; import com.redhat.rhn.domain.server.ServerGroupType; - import com.redhat.rhn.domain.server.test.ServerFactoryTest; - import com.redhat.rhn.domain.token.ActivationKey; import com.redhat.rhn.domain.token.ActivationKeyFactory; - import com.redhat.rhn.domain.user.User; - import com.redhat.rhn.manager.token.ActivationKeyManager; - import com.redhat.rhn.testing.BaseTestCaseWithUser; import com.redhat.rhn.testing.ServerGroupTestUtils; import com.redhat.rhn.testing.TestUtils; diff --git a/java/code/src/com/redhat/rhn/domain/token/test/TokenPackageFactoryTest.java b/java/code/src/com/redhat/rhn/domain/token/test/TokenPackageFactoryTest.java index 196424e..e6cf389 100644 --- a/java/code/src/com/redhat/rhn/domain/token/test/TokenPackageFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/token/test/TokenPackageFactoryTest.java @@ -14,8 +14,6 @@ */ package com.redhat.rhn.domain.token.test;
-import java.util.List; - import com.redhat.rhn.domain.rhnpackage.PackageArch; import com.redhat.rhn.domain.token.ActivationKey; import com.redhat.rhn.domain.token.TokenPackage; @@ -23,6 +21,8 @@ import com.redhat.rhn.domain.token.TokenPackageFactory; import com.redhat.rhn.testing.BaseTestCaseWithUser; import com.redhat.rhn.testing.TestUtils;
+import java.util.List; + /** * TokenPackageFactoryTest * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/domain/user/User.java b/java/code/src/com/redhat/rhn/domain/user/User.java index d9aee67..7533cc3 100644 --- a/java/code/src/com/redhat/rhn/domain/user/User.java +++ b/java/code/src/com/redhat/rhn/domain/user/User.java @@ -15,15 +15,13 @@
package com.redhat.rhn.domain.user;
-import java.util.Date; -import java.util.Set; - import com.redhat.rhn.domain.org.Org; - import com.redhat.rhn.domain.role.Role; - import com.redhat.rhn.domain.server.Server;
+import java.util.Date; +import java.util.Set; + /** * Class User that reflects the DB representation of web_contact * and ancillary tables. diff --git a/java/code/src/com/redhat/rhn/domain/user/legacy/LegacyRhnUserImpl.java b/java/code/src/com/redhat/rhn/domain/user/legacy/LegacyRhnUserImpl.java index d49c55b..d3081a1 100644 --- a/java/code/src/com/redhat/rhn/domain/user/legacy/LegacyRhnUserImpl.java +++ b/java/code/src/com/redhat/rhn/domain/user/legacy/LegacyRhnUserImpl.java @@ -16,6 +16,7 @@ package com.redhat.rhn.domain.user.legacy;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.util.MD5Crypt; import com.redhat.rhn.domain.BaseDomainHelper; @@ -163,7 +164,7 @@ public class LegacyRhnUserImpl extends BaseDomainHelper implements User { * password before setting it. Otherwise, just * set it. */ - if (Config.get().getBoolean(Config.WEB_ENCRYPTED_PASSWORDS)) { + if (Config.get().getBoolean(ConfigDefaults.WEB_ENCRYPTED_PASSWORDS)) { this.password = MD5Crypt.crypt(passwordIn); } else { @@ -256,7 +257,7 @@ public class LegacyRhnUserImpl extends BaseDomainHelper implements User {
/** {@inheritDoc} */ public boolean authenticate(String thePassword) { - String pamAuthService = Config.get().getString(Config.WEB_PAM_AUTH_SERVICE); + String pamAuthService = Config.get().getString(ConfigDefaults.WEB_PAM_AUTH_SERVICE); boolean result = false; /* * If we have a valid pamAuthService and the user uses pam authentication, @@ -278,7 +279,7 @@ public class LegacyRhnUserImpl extends BaseDomainHelper implements User { * a straight clear-text comparison. */ boolean useEncrPasswds = - Config.get().getBoolean(Config.WEB_ENCRYPTED_PASSWORDS); + Config.get().getBoolean(ConfigDefaults.WEB_ENCRYPTED_PASSWORDS); if (useEncrPasswds) { result = MD5Crypt.crypt(thePassword, password).equals(password); } @@ -925,7 +926,7 @@ public class LegacyRhnUserImpl extends BaseDomainHelper implements User { * password before setting it. Otherwise, just * set it. */ - if (Config.get().getBoolean(Config.WEB_ENCRYPTED_PASSWORDS)) { + if (Config.get().getBoolean(ConfigDefaults.WEB_ENCRYPTED_PASSWORDS)) { password = MD5Crypt.crypt(passwordIn); } else { diff --git a/java/code/src/com/redhat/rhn/domain/user/test/UserFactoryTest.java b/java/code/src/com/redhat/rhn/domain/user/test/UserFactoryTest.java index 5a00359..40b6abf 100644 --- a/java/code/src/com/redhat/rhn/domain/user/test/UserFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/user/test/UserFactoryTest.java @@ -15,24 +15,12 @@
package com.redhat.rhn.domain.user.test;
-import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - -import java.util.ArrayList; -import java.util.List; - import com.redhat.rhn.common.hibernate.HibernateFactory; - import com.redhat.rhn.common.localization.LocalizationService; - import com.redhat.rhn.domain.org.Org; - import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerConstants; - import com.redhat.rhn.domain.server.test.ServerFactoryTest; - import com.redhat.rhn.domain.user.Address; import com.redhat.rhn.domain.user.RhnTimeZone; import com.redhat.rhn.domain.user.State; @@ -41,9 +29,7 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.domain.user.UserServerPreference; import com.redhat.rhn.domain.user.UserServerPreferenceId; - import com.redhat.rhn.manager.user.UserManager; - import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.TestStatics; import com.redhat.rhn.testing.TestUtils; @@ -51,6 +37,12 @@ import com.redhat.rhn.testing.UserTestUtils;
import org.hibernate.Session;
+import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.ArrayList; +import java.util.List; + /** JUnit test case for the User * class. * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/domain/user/test/UserTest.java b/java/code/src/com/redhat/rhn/domain/user/test/UserTest.java index 44aa7f5..1e4cdd8 100644 --- a/java/code/src/com/redhat/rhn/domain/user/test/UserTest.java +++ b/java/code/src/com/redhat/rhn/domain/user/test/UserTest.java @@ -15,30 +15,25 @@
package com.redhat.rhn.domain.user.test;
-import java.util.Date; -import java.util.Set; - import com.redhat.rhn.common.conf.Config; - +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.util.MD5Crypt; - import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; - import com.redhat.rhn.domain.role.Role; import com.redhat.rhn.domain.role.RoleFactory; - import com.redhat.rhn.domain.server.Server; - import com.redhat.rhn.domain.user.Address; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.user.UserFactory; - import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.ServerTestUtils; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils;
+import java.util.Date; +import java.util.Set; + /** JUnit test case for the User * class. */ @@ -127,7 +122,7 @@ public class UserTest extends RhnBaseTestCase { assertNotNull(usr.getOrg());
usr.setPassword(foo); - boolean encrypt = Config.get().getBoolean(Config.WEB_ENCRYPTED_PASSWORDS); + boolean encrypt = Config.get().getBoolean(ConfigDefaults.WEB_ENCRYPTED_PASSWORDS); if (encrypt) { assertEquals(MD5Crypt.crypt("foo", usr.getPassword()), usr.getPassword()); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/DispatchedAction.java b/java/code/src/com/redhat/rhn/frontend/action/DispatchedAction.java index caf7825..cbc80a0 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/DispatchedAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/DispatchedAction.java @@ -14,15 +14,15 @@ */ package com.redhat.rhn.frontend.action;
-import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction;
import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping;
-import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.RhnAction; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** * Abstract POST action class that provides for setup->confirm->commit diff --git a/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java b/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java index 0c1fe39..da7d3a4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/YourRhnAction.java @@ -14,20 +14,6 @@ */ package com.redhat.rhn.frontend.action;
-import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - import com.redhat.rhn.domain.user.Pane; import com.redhat.rhn.domain.user.PaneFactory; import com.redhat.rhn.domain.user.User; @@ -45,6 +31,20 @@ import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * YourRhnAction * @version $Rev$ 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 c8c4c66..d42ca6a 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 @@ -23,6 +23,7 @@ import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.user.UserManager; + import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; 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 d553c0a..571d52f 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 @@ -17,16 +17,16 @@ package com.redhat.rhn.frontend.action.channel;
import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.validator.ValidatorException; -import com.redhat.rhn.domain.channel.ChannelArch; import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.channel.ChannelArch; import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.dto.PackageOverview; import com.redhat.rhn.frontend.dto.PackageDto; +import com.redhat.rhn.frontend.dto.PackageOverview; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; -import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.frontend.xmlrpc.SearchServerIndexException; +import com.redhat.rhn.manager.channel.ChannelManager;
import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -42,8 +42,8 @@ import java.net.MalformedURLException; import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; -import java.util.List; import java.util.HashMap; +import java.util.List; import java.util.Map;
import javax.servlet.http.HttpServletRequest; diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java index f03662b..2d3e50d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.frontend.action.channel;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.frontend.dto.PackageOverview; import com.redhat.rhn.frontend.xmlrpc.SearchServerIndexException; @@ -94,7 +94,8 @@ public class PackageSearchHelper { }
// call search server - XmlRpcClient client = new XmlRpcClient(Config.get().getSearchServerUrl(), true); + XmlRpcClient client = new XmlRpcClient( + ConfigDefaults.get().getSearchServerUrl(), true); List args = new ArrayList(); args.add(sessionId); args.add("package"); 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 e72e9db..966d127 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 @@ -14,19 +14,6 @@ */ package com.redhat.rhn.frontend.action.channel.manage;
-import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; @@ -42,6 +29,19 @@ import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * * AddCustomErrataAction diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddErrataAction.java index 28bada0..be96a6c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddErrataAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddErrataAction.java @@ -14,19 +14,19 @@ */ package com.redhat.rhn.frontend.action.channel.manage;
-import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnListAction;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * * AddErrataAction 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 94deaea..e7df9e6 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 @@ -14,19 +14,6 @@ */ package com.redhat.rhn.frontend.action.channel.manage;
-import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; @@ -45,6 +32,19 @@ import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * * AddRedHatErrataAction 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 0332303..7bc71de 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 @@ -14,13 +14,6 @@ */ package com.redhat.rhn.frontend.action.channel.manage;
-import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.channel.Channel; @@ -30,6 +23,13 @@ import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * Handles the page display and actual deletion of a software channel. * 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 5ea102d..929dfc2 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 @@ -14,24 +14,6 @@ */ package com.redhat.rhn.frontend.action.channel.manage;
-import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.action.DynaActionForm; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.security.PermissionException; @@ -59,6 +41,24 @@ import com.redhat.rhn.manager.channel.UpdateChannelCommand; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.user.UserManager;
+import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.action.DynaActionForm; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +
/** * EditChannelAction diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataFilter.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataFilter.java index 47686f9..de0755c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataFilter.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataFilter.java @@ -14,12 +14,12 @@ */ package com.redhat.rhn.frontend.action.channel.manage;
-import java.util.Locale; -import java.util.Map; - import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.frontend.taglibs.list.BaseListFilter;
+import java.util.Locale; +import java.util.Map; + /** * * ErrataFilter diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataIndexAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataIndexAction.java index 4375e42..bbc8c0a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataIndexAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ErrataIndexAction.java @@ -14,19 +14,19 @@ */ package com.redhat.rhn.frontend.action.channel.manage;
-import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnListAction;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * * AddErrataAction 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 1c1fa4c..312548f 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 @@ -14,19 +14,22 @@ */ package com.redhat.rhn.frontend.action.channel.manage;
+import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; +import com.redhat.rhn.manager.channel.ChannelManager; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionForm; -import com.redhat.rhn.frontend.taglibs.list.helper.Listable; -import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; -import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.manager.channel.ChannelManager; -import com.redhat.rhn.common.db.datasource.DataResult;
/** * Action responsible for displaying the list of user created software channels. diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PatchSetListAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PatchSetListAction.java index 812fbf0..b9d5e38 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PatchSetListAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PatchSetListAction.java @@ -14,18 +14,6 @@ */ package com.redhat.rhn.frontend.action.channel.manage;
-import java.util.Iterator; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; @@ -44,6 +32,18 @@ import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.user.UserManager;
+import org.apache.log4j.Logger; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; + +import java.util.Iterator; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * * PatchSetListAction 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 56e8b86..d6b6c80 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 @@ -27,12 +27,12 @@ import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.DynaActionForm; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory;
import java.util.ArrayList; import java.util.Enumeration; 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 3a32855..4bd9f30 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 @@ -14,27 +14,27 @@ */ package com.redhat.rhn.frontend.action.channel.ssm;
+import com.redhat.rhn.common.messaging.MessageQueue; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.RhnSetElement; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.events.SsmChangeChannelSubscriptionsEvent; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnHelper; -import com.redhat.rhn.frontend.events.SsmChangeChannelSubscriptionsEvent; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.ssm.SsmManager; -import com.redhat.rhn.common.messaging.MessageQueue;
+import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.DynaActionForm; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory;
import java.util.ArrayList; import java.util.Iterator; 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 ff0c23b..28519aa 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 @@ -14,20 +14,23 @@ */ package com.redhat.rhn.frontend.action.channel.ssm;
-import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; +import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnHelper; import com.redhat.rhn.frontend.struts.RhnListAction; import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.frontend.taglibs.list.helper.Listable; -import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.channel.ChannelManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * Used in the first step of the SSM install package workflow, this action will * present the user with a list of all channels and allow one to be selected. diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java index 4c47fc5..4f9f57e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java +++ b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.common;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.security.SessionSwap; import com.redhat.rhn.common.util.FileUtils; import com.redhat.rhn.common.util.MD5Sum; @@ -287,7 +288,7 @@ public class DownloadFile extends DownloadAction { log.debug("getStreamInfo KICKSTART type, path: " + path); } String diskPath = null; - String kickstartMount = Config.get().getString(Config.MOUNT_POINT); + String kickstartMount = Config.get().getString(ConfigDefaults.MOUNT_POINT); String fileName; KickstartSession ksession = (KickstartSession) params.get(SESSION); KickstartSessionState newState = null; @@ -304,7 +305,6 @@ public class DownloadFile extends DownloadAction { log.debug("Tree isnt rooted at /var/satellite, lets just use basepath"); kickstartMount = ""; } - // Searching for RPM if (path.endsWith(".rpm")) { String[] split = StringUtils.split(path, '/'); @@ -315,7 +315,7 @@ public class DownloadFile extends DownloadAction { Channel channel = tree.getChannel(); rpmPackage = ChannelFactory.lookupPackageByFilename(channel, fileName); if (rpmPackage != null) { - diskPath = Config.get().getString(Config.MOUNT_POINT) + "/" + + diskPath = Config.get().getString(ConfigDefaults.MOUNT_POINT) + "/" + rpmPackage.getPath(); if (log.isDebugEnabled()) { log.debug("found package :: diskPath path: " + diskPath); @@ -329,7 +329,6 @@ public class DownloadFile extends DownloadAction { } } } - // either it's not an rpm, or we didn't find it in the channel // check for dir pings, virt manager or install, bz #345721 if (diskPath == null) { @@ -358,11 +357,9 @@ public class DownloadFile extends DownloadAction { }
} - if (log.isDebugEnabled()) { log.debug("Final path before returning getStreamForBinary(): " + diskPath); } - if (log.isDebugEnabled()) { Enumeration e = request.getHeaderNames(); while (e.hasMoreElements()) { @@ -374,7 +371,6 @@ public class DownloadFile extends DownloadAction { log.debug("Method is HEAD .. serving checksum"); return manualServeChecksum(response, diskPath); } - else if (request.getHeader("Range") != null) { log.debug("range detected. serving chunk of file"); String range = request.getHeader("Range"); @@ -398,15 +394,14 @@ public class DownloadFile extends DownloadAction { } log.debug("returning getStreamForBinary");
- File actualFile = new File(diskPath); - - Date mtime = new Date(actualFile.lastModified()); - SimpleDateFormat formatter = new SimpleDateFormat( - "EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US); - formatter.setTimeZone(TimeZone.getTimeZone("GMT")); - response.addHeader("last-modified", formatter.format(mtime)); - response.addHeader("Content-Length", String.valueOf(actualFile.length())); - log.debug("added last-modified and content-length values"); + File actualFile = new File(diskPath); + Date mtime = new Date(actualFile.lastModified()); + SimpleDateFormat formatter = new SimpleDateFormat( + "EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US); + formatter.setTimeZone(TimeZone.getTimeZone("GMT")); + response.addHeader("last-modified", formatter.format(mtime)); + response.addHeader("Content-Length", String.valueOf(actualFile.length())); + log.debug("added last-modified and content-length values"); return getStreamForBinary(diskPath); } else { @@ -415,14 +410,15 @@ public class DownloadFile extends DownloadAction { User user = UserFactory.lookupById(userid); if (type.equals(DownloadManager.DOWNLOAD_TYPE_PACKAGE)) { Package pack = PackageFactory.lookupByIdAndOrg(fileId, user.getOrg()); - path = Config.get().getString(Config.MOUNT_POINT) + "/" + pack.getPath(); + path = Config.get().getString(ConfigDefaults.MOUNT_POINT) + + "/" + pack.getPath(); return getStreamForBinary(path); } else if (type.equals(DownloadManager.DOWNLOAD_TYPE_SOURCE)) { Package pack = PackageFactory.lookupByIdAndOrg(fileId, user.getOrg()); List<PackageSource> src = PackageFactory.lookupPackageSources(pack); if (!src.isEmpty()) { - path = Config.get().getString(Config.MOUNT_POINT) + "/" + + path = Config.get().getString(ConfigDefaults.MOUNT_POINT) + "/" + src.get(0).getPath(); return getStreamForBinary(path); } 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 8104c9d..00a83bd 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 @@ -14,16 +14,6 @@ */ package com.redhat.rhn.frontend.action.configuration;
-import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.DynaActionForm; - import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.common.validator.ValidatorResult; @@ -35,6 +25,16 @@ import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnValidationHelper; import com.redhat.rhn.manager.configuration.ConfigFileBuilder;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; + +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * BaseAddFilesAction * @version $Rev$ 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 bb49df8..22440ab 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 @@ -14,14 +14,6 @@ */ package com.redhat.rhn.frontend.action.configuration;
-import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.text.DecimalFormat; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.struts.upload.FormFile; - import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorError; @@ -42,6 +34,14 @@ import com.redhat.rhn.manager.configuration.file.ConfigFileData; import com.redhat.rhn.manager.configuration.file.DirectoryData; import com.redhat.rhn.manager.configuration.file.TextFileData;
+import org.apache.struts.upload.FormFile; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.text.DecimalFormat; + +import javax.servlet.http.HttpServletRequest; + /** * ConfigFileForm * @version $Rev$ 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 1212aac..b78adae 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 @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.configuration.files;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.config.ConfigRevision; @@ -127,8 +128,8 @@ public class FileDetailsAction extends RhnAction {
request.setAttribute(MAX_SIZE, StringUtil.displayFileSize( - Config.get().getInt(Config.CONFIG_REVISION_MAX_SIZE, - Config.DEFAULT_CONFIG_REVISION_MAX_SIZE))); + Config.get().getInt(ConfigDefaults.CONFIG_REVISION_MAX_SIZE, + ConfigDefaults.DEFAULT_CONFIG_REVISION_MAX_SIZE))); request.setAttribute(MAX_EDIT_SIZE, StringUtil.displayFileSize(ConfigFileForm.MAX_EDITABLE_SIZE));
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 b76b504..8f83bbe 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 @@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.action.configuration.files; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.config.ConfigChannel; import com.redhat.rhn.domain.config.ConfigFile; - import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.configuration.ConfigActionHelper; import com.redhat.rhn.frontend.listview.PageControl; 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 597e97f..e598897 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 @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.configuration.files;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.domain.config.ConfigFile; @@ -40,8 +41,8 @@ public class ManageRevisionSetup extends BaseSetListAction { }
protected void processRequestAttributes(RequestContext rctxIn) { - int max = Config.get().getInt(Config.CONFIG_REVISION_MAX_SIZE, - Config.DEFAULT_CONFIG_REVISION_MAX_SIZE); + int max = Config.get().getInt(ConfigDefaults.CONFIG_REVISION_MAX_SIZE, + ConfigDefaults.DEFAULT_CONFIG_REVISION_MAX_SIZE);
rctxIn.getRequest().setAttribute("max_size", StringUtil.displayFileSize(max)); 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 3471948..c5a1c32 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 @@ -14,8 +14,6 @@ */ package com.redhat.rhn.frontend.action.configuration.sdc;
-import javax.servlet.http.HttpServletRequest; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; @@ -26,6 +24,8 @@ import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.configuration.ConfigurationManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+import javax.servlet.http.HttpServletRequest; + /** * ChannelListAction, for configuration in sdc * @version $Rev$ 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 acb7d0e..d460fed 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 @@ -15,9 +15,9 @@ package com.redhat.rhn.frontend.action.configuration.sdc;
import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.frontend.struts.BaseSetListAction; 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 281334c..1602f66 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 @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.action.configuration.sdc;
+import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.config.ConfigChannel; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.server.Server; @@ -25,7 +26,6 @@ import com.redhat.rhn.frontend.struts.RhnHelper; import com.redhat.rhn.manager.configuration.ConfigurationManager; import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.system.SystemManager; -import com.redhat.rhn.common.localization.LocalizationService;
import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; 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 2790f96..17f9bae 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 @@ -18,8 +18,8 @@ import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.common.BaseSetOperateOnSelectedItemsAction; -import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.dto.ConfigChannelDto; +import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.configuration.ConfigurationManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; @@ -29,8 +29,8 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage;
-import java.util.Map; import java.util.Iterator; +import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; 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 ba2aecf..36af626 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 @@ -14,18 +14,6 @@ */ package com.redhat.rhn.frontend.action.errata;
-import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.util.LabelValueBean; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.errata.Errata; @@ -44,6 +32,21 @@ import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.util.LabelValueBean; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** @version $Revision$ */ public class AddPackagesAction extends RhnAction implements Listable {
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 fb61bd0..25ddc6a 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 @@ -14,18 +14,6 @@ */ package com.redhat.rhn.frontend.action.errata;
-import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.errata.Errata; @@ -44,6 +32,21 @@ import com.redhat.rhn.manager.errata.cache.ErrataCacheManager; import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** @version $Revision$ */ public class AddPackagesConfirmAction extends RhnAction implements Listable {
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 96d6859..09f6884 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 @@ -14,15 +14,6 @@ */ package com.redhat.rhn.frontend.action.errata;
-import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.util.LabelValueBean; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.channel.Channel; @@ -35,6 +26,18 @@ import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.util.LabelValueBean; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * CloneErrataSubmitAction * 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 fb7c2fe..73a5101 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 @@ -14,11 +14,10 @@ */ package com.redhat.rhn.frontend.action.errata;
-import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.redhat.rhn.domain.errata.Errata; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.manager.errata.ErrataManager;
import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -27,10 +26,11 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.actions.LookupDispatchAction;
-import com.redhat.rhn.domain.errata.Errata; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.manager.errata.ErrataManager; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** * DeleteErratumAction diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java index 271e044..d9f8427 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/EditAction.java @@ -14,17 +14,16 @@ */ package com.redhat.rhn.frontend.action.errata;
-import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.redhat.rhn.common.hibernate.HibernateFactory; +import com.redhat.rhn.common.hibernate.HibernateRuntimeException; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.util.StringUtil; +import com.redhat.rhn.domain.errata.Errata; +import com.redhat.rhn.frontend.action.common.BadParameterException; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnValidationHelper; +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.manager.errata.ErrataManager;
import org.apache.commons.collections.IteratorUtils; import org.apache.commons.lang.StringUtils; @@ -38,16 +37,17 @@ import org.apache.struts.action.DynaActionForm; import org.apache.struts.actions.LookupDispatchAction; import org.hibernate.HibernateException;
-import com.redhat.rhn.common.hibernate.HibernateFactory; -import com.redhat.rhn.common.hibernate.HibernateRuntimeException; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.util.StringUtil; -import com.redhat.rhn.domain.errata.Errata; -import com.redhat.rhn.frontend.action.common.BadParameterException; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.RhnValidationHelper; -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.manager.errata.ErrataManager; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** * EditAction 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 4e5b788..489db9e 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 @@ -14,12 +14,6 @@ */ package com.redhat.rhn.frontend.action.errata;
-import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; @@ -28,6 +22,15 @@ import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.errata.ErrataManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * Base action for all pages that display an errata list. Subclasses simply implement * the {@link #getErrataFilter()} method to indicate what data to return. 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 5febc05..f02c123 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 @@ -14,13 +14,13 @@ */ package com.redhat.rhn.frontend.action.errata;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.util.DatePicker; +import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.frontend.action.common.DateRangePicker; import com.redhat.rhn.frontend.action.common.DateRangePicker.DatePickerResults; -import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.frontend.dto.ErrataOverview; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; @@ -264,7 +264,8 @@ public class ErrataSearchAction extends RhnAction { log.warn("Performing errata search"); RequestContext ctx = new RequestContext(request); // call search server - XmlRpcClient client = new XmlRpcClient(Config.get().getSearchServerUrl(), true); + XmlRpcClient client = new XmlRpcClient( + ConfigDefaults.get().getSearchServerUrl(), true); String path = null; List args = new ArrayList(); args.add(sessionId); 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 642cded..32d4bf2 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 @@ -14,19 +14,6 @@ */ package com.redhat.rhn.frontend.action.errata;
-import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.DynaActionForm; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.errata.Errata; @@ -43,6 +30,19 @@ import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; + +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * PackagePushAction * @version $Rev$ 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 3edaabf..eeb1dca 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 @@ -14,12 +14,6 @@ */ package com.redhat.rhn.frontend.action.errata;
-import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; @@ -29,6 +23,15 @@ import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** @version $Revision$ */ public class PublishedErrataAction extends RhnAction implements Listable {
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 7e3f6f1..7f743bc 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 @@ -14,20 +14,23 @@ */ package com.redhat.rhn.frontend.action.errata;
-import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionForm; -import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.taglibs.list.helper.Listable; +import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.taglibs.list.helper.ListRhnSetHelper; -import com.redhat.rhn.manager.rhnset.RhnSetDecl; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.errata.ErrataManager; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.manager.rhnset.RhnSetDecl; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** @version $Revision$ */ public class UnpublishedErrataAction extends RhnAction implements Listable { diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmSetupActionTest.java index 9df2443..4f7cee9 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/ErrataConfirmSetupActionTest.java @@ -18,10 +18,10 @@ import com.redhat.rhn.common.util.DatePicker; import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.errata.test.ErrataFactoryTest; import com.redhat.rhn.domain.org.OrgFactory; +import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.RhnSetFactory; import com.redhat.rhn.domain.server.Server; -import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.frontend.dto.SystemOverview; 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 14c3db0..9fa48f7 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 @@ -14,8 +14,6 @@ */ package com.redhat.rhn.frontend.action.errata.test;
-import java.util.HashSet; - import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.errata.test.ErrataFactoryTest; import com.redhat.rhn.domain.rhnpackage.Package; @@ -38,6 +36,8 @@ import com.redhat.rhn.testing.TestUtils; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping;
+import java.util.HashSet; + /** * RemovePackagesActionTest * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/test/UnpublishedDeleteConfirmSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/errata/test/UnpublishedDeleteConfirmSetupActionTest.java index 8dad135..cdb4fbb 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/errata/test/UnpublishedDeleteConfirmSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/errata/test/UnpublishedDeleteConfirmSetupActionTest.java @@ -14,8 +14,6 @@ */ package com.redhat.rhn.frontend.action.errata.test;
-import java.util.Iterator; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.errata.test.ErrataFactoryTest; @@ -29,6 +27,8 @@ import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import java.util.Iterator; + /** * DeleteConfirmSetupActionTest * @version $Rev$ 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 5648072..052cdfa 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 @@ -14,6 +14,25 @@ */ package com.redhat.rhn.frontend.action.help;
+import com.redhat.rhn.common.conf.ConfigDefaults; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.validator.ValidatorException; +import com.redhat.rhn.frontend.context.Context; +import com.redhat.rhn.frontend.dto.HelpDocumentOverview; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; + +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.action.DynaActionForm; + import java.net.MalformedURLException; import java.util.ArrayList; import java.util.Collections; @@ -26,29 +45,10 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.action.DynaActionForm; - import redstone.xmlrpc.XmlRpcClient; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcFault;
-import com.redhat.rhn.common.conf.Config; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.validator.ValidatorException; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; -import com.redhat.rhn.frontend.context.Context; -import com.redhat.rhn.frontend.dto.HelpDocumentOverview; - /** * DocSearchSetupAction * @version $Rev$ @@ -184,7 +184,8 @@ public class DocSearchSetupAction extends RhnAction { log.debug("Performing doc search");
// call search server - XmlRpcClient client = new XmlRpcClient(Config.get().getSearchServerUrl(), true); + XmlRpcClient client = new XmlRpcClient( + ConfigDefaults.get().getSearchServerUrl(), true); List args = new ArrayList(); args.add(sessionId); args.add("docs"); 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 34db2c8..bc93308 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 @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.help;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; @@ -42,37 +43,37 @@ public class HelpAction extends RhnAction { RequestContext requestContext = new RequestContext(request); User user = requestContext.getLoggedInUser();
- String doc = Config.get().getString(Config.DOC_REFERENCE_GUIDE); + String doc = Config.get().getString(ConfigDefaults.DOC_REFERENCE_GUIDE); if (doc != null && doc.trim().length() > 0) { request.setAttribute("reference_guide", doc); }
- doc = Config.get().getString(Config.DOC_INSTALL_GUIDE); + doc = Config.get().getString(ConfigDefaults.DOC_INSTALL_GUIDE); if (doc != null && doc.trim().length() > 0) { request.setAttribute("install_guide", doc); }
- doc = Config.get().getString(Config.DOC_PROXY_GUIDE); + doc = Config.get().getString(ConfigDefaults.DOC_PROXY_GUIDE); if (doc != null && doc.trim().length() > 0) { request.setAttribute("proxy_guide", doc); }
- doc = Config.get().getString(Config.DOC_CLIENT_CONFIG_GUIDE); + doc = Config.get().getString(ConfigDefaults.DOC_CLIENT_CONFIG_GUIDE); if (doc != null && doc.trim().length() > 0) { request.setAttribute("client_config_guide", doc); }
- doc = Config.get().getString(Config.DOC_CHANNEL_MGMT_GUIDE); + doc = Config.get().getString(ConfigDefaults.DOC_CHANNEL_MGMT_GUIDE); if (doc != null && doc.trim().length() > 0) { request.setAttribute("channel_mgmt_guide", doc); }
- doc = Config.get().getString(Config.DOC_RELEASE_NOTES); + doc = Config.get().getString(ConfigDefaults.DOC_RELEASE_NOTES); if (doc != null && doc.trim().length() > 0) { request.setAttribute("release_notes", doc); }
- doc = Config.get().getString(Config.DOC_PROXY_RELEASE_NOTES); + doc = Config.get().getString(ConfigDefaults.DOC_PROXY_RELEASE_NOTES); if (doc != null && doc.trim().length() > 0) { request.setAttribute("proxy_release_notes", doc); } 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 7ce1239..aeb0472 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 @@ -14,16 +14,16 @@ */ package com.redhat.rhn.frontend.action.kickstart;
-import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.security.PermissionException; +import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnValidationHelper; import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.manager.kickstart.BaseKickstartCommand; import com.redhat.rhn.manager.acl.AclManager; +import com.redhat.rhn.manager.kickstart.BaseKickstartCommand;
import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; 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 6a9b7eb..5854944 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 @@ -14,7 +14,22 @@ */ package com.redhat.rhn.frontend.action.kickstart;
+import com.redhat.rhn.common.util.MD5Crypt; +import com.redhat.rhn.domain.kickstart.KickstartCommand; +import com.redhat.rhn.domain.kickstart.KickstartCommandName; +import com.redhat.rhn.domain.kickstart.KickstartFactory; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.manager.kickstart.KickstartOptionsCommand; + import org.apache.log4j.Logger; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages;
import java.util.Date; import java.util.HashSet; @@ -27,22 +42,6 @@ import java.util.StringTokenizer; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; - -import com.redhat.rhn.common.util.MD5Crypt; -import com.redhat.rhn.domain.kickstart.KickstartCommand; -import com.redhat.rhn.domain.kickstart.KickstartCommandName; -import com.redhat.rhn.domain.kickstart.KickstartFactory; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.manager.kickstart.KickstartOptionsCommand; - /** * KickstartAdvancedOptions extends RhnAction * @version $Rev: 1 $ 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 d05310b..50899a4 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 @@ -14,18 +14,6 @@ */ package com.redhat.rhn.frontend.action.kickstart;
-import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.DynaActionForm; - import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.kickstart.KickstartData; @@ -39,6 +27,18 @@ import com.redhat.rhn.frontend.struts.RhnValidationHelper; import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.manager.kickstart.KickstartCloneCommand;
+import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; + +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * KickstartCloneAction - action for cloning a KS. Can't use BaseKickstartEdit action * because we have to forward to a different Kickstart vs the one we started with. 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 e2fb148..fe3660e 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 @@ -15,7 +15,7 @@ package com.redhat.rhn.frontend.action.kickstart;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.domain.kickstart.KickstartData; @@ -153,19 +153,19 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction { !type.equals(KickstartVirtualizationType.none())) { if (prof == null) { form.set(VIRT_BRIDGE, data.getDefaultVirtBridge()); - form.set(VIRT_CPU, Config.get().getDefaultVirtCpus()); - form.set(VIRT_DISK_SIZE, Config.get().getDefaultVirtDiskSize()); - form.set(VIRT_MEMORY, Config.get().getDefaultVirtMemorySize()); + form.set(VIRT_CPU, ConfigDefaults.get().getDefaultVirtCpus()); + form.set(VIRT_DISK_SIZE, ConfigDefaults.get().getDefaultVirtDiskSize()); + form.set(VIRT_MEMORY, ConfigDefaults.get().getDefaultVirtMemorySize()); } else { setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge(), data.getDefaultVirtBridge()); setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), - Config.get().getDefaultVirtCpus()); + ConfigDefaults.get().getDefaultVirtCpus()); setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFileSize(), - Config.get().getDefaultVirtDiskSize()); + ConfigDefaults.get().getDefaultVirtDiskSize()); setFormValueOrDefault(form, VIRT_MEMORY, prof.getVirtRam(), - Config.get().getDefaultVirtMemorySize()); + ConfigDefaults.get().getDefaultVirtMemorySize()); } ctx.getRequest().setAttribute(IS_VIRT, Boolean.TRUE); } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java index 97052e0..e30ead3 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartHelper.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.frontend.action.kickstart;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; @@ -320,7 +320,7 @@ public class KickstartHelper { return firstProxy; } else { - return Config.get().getCobblerHost(); + return ConfigDefaults.get().getCobblerHost(); } }
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java index 42ed6c8..83697d6 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java @@ -14,15 +14,15 @@ */ package com.redhat.rhn.frontend.action.kickstart;
-import java.util.Locale; -import java.util.Map; - import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.frontend.dto.kickstart.KickstartIpRangeDto; import com.redhat.rhn.frontend.taglibs.list.BaseListFilter; import com.redhat.rhn.manager.kickstart.IpAddress; import com.redhat.rhn.manager.kickstart.IpAddressRange;
+import java.util.Locale; +import java.util.Map; + /** * KickstartIpRangeFilter * @version $Rev: 1 $ diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartTroubleshootingEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartTroubleshootingEditAction.java index 3b4dcfe..0277de3 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartTroubleshootingEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartTroubleshootingEditAction.java @@ -18,8 +18,8 @@ import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.kickstart.BaseKickstartCommand; import com.redhat.rhn.manager.kickstart.KickstartTroubleshootingCommand; -import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.BooleanUtils; import org.apache.struts.action.DynaActionForm;
import java.util.ArrayList; 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 7a00879..ba55a6e 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 @@ -14,15 +14,6 @@ */ package com.redhat.rhn.frontend.action.kickstart;
-import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.DynaActionForm; -import org.cobbler.CobblerObject; - import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.common.util.StringUtil; @@ -34,6 +25,15 @@ import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnValidationHelper;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; +import org.cobbler.CobblerObject; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * KickstartDetailsEdit extends RhnAction * @version $Rev: 1 $ diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java index bdab4ac..13b45a5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/ScheduleKickstartWizardTest.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.frontend.action.kickstart.test;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.test.ChannelFactoryTest; import com.redhat.rhn.domain.kickstart.KickstartData; @@ -75,7 +75,7 @@ public class ScheduleKickstartWizardTest extends RhnMockStrutsTestCase { s.addChannel(c);
PackageManagerTest.addPackageToSystemAndChannel( - Config.get().getKickstartPackageName(), s, c); + ConfigDefaults.get().getKickstartPackageName(), s, c);
PackageManagerTest. addUp2dateToSystemAndChannel(user, s, diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java index 16c6d07..8cc5984 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/tree/test/TreeActionTest.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.frontend.action.kickstart.tree.test;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.test.ChannelFactoryTest; import com.redhat.rhn.domain.kickstart.KickstartData; @@ -119,7 +119,7 @@ public class TreeActionTest extends RhnMockStrutsTestCase { Channel rhel5BaseChan = ChannelTestUtils.createTestChannel(user); Channel rhel5ToolsChan = ChannelTestUtils.createChildChannel(user, rhel5BaseChan); PackageManagerTest.addKickstartPackageToChannel( - Config.get().getKickstartPackageName(), rhel5ToolsChan); + ConfigDefaults.get().getKickstartPackageName(), rhel5ToolsChan); return rhel5BaseChan; }
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 ac66a04..14e4cfa 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 @@ -14,19 +14,6 @@ */ package com.redhat.rhn.frontend.action.monitoring;
-import java.util.Iterator; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.monitoring.satcluster.SatCluster; import com.redhat.rhn.domain.monitoring.satcluster.SatClusterFactory; @@ -41,6 +28,19 @@ import com.redhat.rhn.manager.monitoring.MonitoringManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; + +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * ProbeSuiteSystemsEditAction - Action to handle adding/removing systems * from the ProbeSuite. diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseFilterEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseFilterEditAction.java index 43db944..98d0c0e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseFilterEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/BaseFilterEditAction.java @@ -22,8 +22,8 @@ import com.redhat.rhn.domain.monitoring.notification.MatchType; import com.redhat.rhn.domain.monitoring.notification.NotificationFactory; import com.redhat.rhn.domain.monitoring.satcluster.SatCluster; import com.redhat.rhn.domain.org.Org; -import com.redhat.rhn.frontend.action.common.DateRangePicker.DatePickerResults; import com.redhat.rhn.frontend.action.common.DateRangePicker; +import com.redhat.rhn.frontend.action.common.DateRangePicker.DatePickerResults; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnValidationHelper; diff --git a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java index 2bb3830..2e91733 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/monitoring/notification/test/FilterActionTest.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.frontend.action.monitoring.notification.test;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.monitoring.MonitoringFactory; import com.redhat.rhn.domain.monitoring.ServerProbe; @@ -71,8 +71,8 @@ public class FilterActionTest extends RhnBaseTestCase {
public void enableMonitoring() throws Exception { ConfigureSatelliteCommand cmd = new ConfigureSatelliteCommand(user); - cmd.updateBoolean(Config.WEB_IS_MONITORING_BACKEND, true); - cmd.updateBoolean(Config.WEB_IS_MONITORING_BACKEND, true); + cmd.updateBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND, true); + cmd.updateBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND, true);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelConsumeAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelConsumeAction.java index 8e788aa..46b8b18 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelConsumeAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelConsumeAction.java @@ -14,8 +14,6 @@ */ package com.redhat.rhn.frontend.action.multiorg;
-import javax.servlet.http.HttpServletRequest; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; @@ -26,6 +24,8 @@ import com.redhat.rhn.frontend.listview.ListControl; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.channel.ChannelManager;
+import javax.servlet.http.HttpServletRequest; + /** * AllChannelTreeSetupAction * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelProvideAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelProvideAction.java index d3af581..a181801 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelProvideAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/ChannelProvideAction.java @@ -14,8 +14,6 @@ */ package com.redhat.rhn.frontend.action.multiorg;
-import javax.servlet.http.HttpServletRequest; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; @@ -25,6 +23,8 @@ import com.redhat.rhn.frontend.listview.ListControl; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.channel.ChannelManager;
+import javax.servlet.http.HttpServletRequest; + /** * AllChannelTreeSetupAction * @version $Rev$ 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 af43112..9b2592a 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 @@ -14,15 +14,6 @@ */ package com.redhat.rhn.frontend.action.multiorg;
-import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.HashMap; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.domain.channel.Channel; @@ -44,6 +35,18 @@ import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.org.OrgManager; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * Handles the (un)enabling of organizations trusted to a channel. */ diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java index 24847d4..f891e8c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java @@ -14,16 +14,8 @@ */ package com.redhat.rhn.frontend.action.multiorg;
-import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.DynaActionForm; - import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.util.MD5Crypt; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.frontend.action.user.UserActionHelper; @@ -32,6 +24,15 @@ import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnValidationHelper; import com.redhat.rhn.manager.org.CreateOrgCommand;
+import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +
/** * OrgCreateAction - Action to create an org. @@ -53,7 +54,7 @@ public class OrgCreateAction extends RhnAction { * If we are a sat and we have setup pam authentication already, display the * checkbox and instructions */ - String pamAuthService = Config.get().getString(Config.WEB_PAM_AUTH_SERVICE); + String pamAuthService = Config.get().getString(ConfigDefaults.WEB_PAM_AUTH_SERVICE); if (pamAuthService != null && pamAuthService.trim().length() > 0) { request.setAttribute("displaypamcheckbox", "true"); } 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 2ebb317..d97b88c 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 @@ -14,13 +14,6 @@ */ package com.redhat.rhn.frontend.action.multiorg;
-import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; @@ -29,6 +22,13 @@ import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.org.OrgManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * Overview Action for the Configuration top level. * @version $Rev$ 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 92a6789..63c6811 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 @@ -14,13 +14,6 @@ */ package com.redhat.rhn.frontend.action.multiorg;
-import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - import com.redhat.rhn.common.db.datasource.DataList; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.dto.TrustedOrgDto; @@ -29,6 +22,13 @@ import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; import com.redhat.rhn.manager.org.OrgManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +
/** * OrgDetailsAction extends RhnAction - Class representation of the table web_customer 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 515597c..c1ff0e7 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 @@ -14,16 +14,6 @@ */ package com.redhat.rhn.frontend.action.multiorg;
-import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.DynaActionForm; import com.redhat.rhn.common.db.datasource.DataList; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.entitlement.Entitlement; @@ -37,6 +27,19 @@ import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.org.OrgManager; import com.redhat.rhn.manager.org.UpdateOrgSystemEntitlementsCommand;
+import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; + +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * SystemEntitlementOrgsAction */ 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 e68ffc5..2d34264 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 @@ -14,18 +14,6 @@ */ package com.redhat.rhn.frontend.action.multiorg;
-import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; @@ -42,6 +30,18 @@ import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * Abstract POST action class that provides for setup->confirm->commit * lifecycle. This should probably be added as a <i>real</i> class and diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustListFilter.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustListFilter.java index d717a8b..845f660 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustListFilter.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/TrustListFilter.java @@ -14,12 +14,12 @@ */ package com.redhat.rhn.frontend.action.multiorg;
-import java.util.Locale; -import java.util.Map; - import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.frontend.taglibs.list.BaseListFilter;
+import java.util.Locale; +import java.util.Map; + /** * UserListFilter * diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgDetailsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgDetailsActionTest.java index 5d01d4e..2bd10aa 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgDetailsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgDetailsActionTest.java @@ -14,11 +14,11 @@ */ package com.redhat.rhn.frontend.action.multiorg.test;
-import org.apache.struts.action.DynaActionForm; - import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import org.apache.struts.action.DynaActionForm; + /** * OrgDetailsActionTest * @version $Rev: 1 $ diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java index a5dfa18..64bf805 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSoftwareSubscriptionsActionTest.java @@ -14,9 +14,6 @@ */ package com.redhat.rhn.frontend.action.multiorg.test;
-import java.util.Iterator; -import java.util.List; - import com.redhat.rhn.domain.channel.ChannelFamily; import com.redhat.rhn.domain.channel.test.ChannelFamilyFactoryTest; import com.redhat.rhn.domain.org.OrgFactory; @@ -26,6 +23,9 @@ import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.testing.RhnMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils;
+import java.util.Iterator; +import java.util.List; + /** * OrgSoftwareSubscriptionsActionTest * @version $Rev: 1 $ diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java index 11c1185..4b3427d 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/test/OrgSystemSubscriptionsActionTest.java @@ -14,13 +14,13 @@ */ package com.redhat.rhn.frontend.action.multiorg.test;
-import org.apache.struts.action.DynaActionForm; - import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import org.apache.struts.action.DynaActionForm; + /** * OrgSubscriptionsActionTest * @version $Rev: 1 $ diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/BaseFragmentRenderer.java b/java/code/src/com/redhat/rhn/frontend/action/renderers/BaseFragmentRenderer.java index 98f5b60..a8180a0 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/renderers/BaseFragmentRenderer.java +++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/BaseFragmentRenderer.java @@ -15,20 +15,20 @@
package com.redhat.rhn.frontend.action.renderers;
-import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.listview.PageControl; +import com.redhat.rhn.frontend.struts.RequestContext;
import org.apache.commons.lang.StringUtils; import org.directwebremoting.WebContext; import org.directwebremoting.WebContextFactory;
-import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.listview.PageControl; -import com.redhat.rhn.frontend.struts.RequestContext; +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** * Simple implementation of a fragment renderer which automates diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/CriticalProbesRenderer.java b/java/code/src/com/redhat/rhn/frontend/action/renderers/CriticalProbesRenderer.java index 6795e59..173e510 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/renderers/CriticalProbesRenderer.java +++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/CriticalProbesRenderer.java @@ -15,10 +15,6 @@
package com.redhat.rhn.frontend.action.renderers;
-import java.util.Iterator; - -import javax.servlet.http.HttpServletRequest; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.monitoring.MonitoringConstants; import com.redhat.rhn.domain.user.User; @@ -27,6 +23,10 @@ import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; import com.redhat.rhn.manager.monitoring.MonitoringManager;
+import java.util.Iterator; + +import javax.servlet.http.HttpServletRequest; + /** * Renders YourRhn fragment for critical probes * diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/CriticalSystemsRenderer.java b/java/code/src/com/redhat/rhn/frontend/action/renderers/CriticalSystemsRenderer.java index d1312a8..45f68ce 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/renderers/CriticalSystemsRenderer.java +++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/CriticalSystemsRenderer.java @@ -15,18 +15,18 @@
package com.redhat.rhn.frontend.action.renderers;
-import javax.servlet.http.HttpServletRequest; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.listview.PageControl; -import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; import com.redhat.rhn.frontend.taglibs.list.TagHelper; import com.redhat.rhn.manager.rhnset.RhnSetDecl; +import com.redhat.rhn.manager.system.SystemManager;
import java.util.Collections;
+import javax.servlet.http.HttpServletRequest; + /** * Renders YourRhn fragment for critical systems * diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/LatestErrataRenderer.java b/java/code/src/com/redhat/rhn/frontend/action/renderers/LatestErrataRenderer.java index 419b3cb..b92706c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/renderers/LatestErrataRenderer.java +++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/LatestErrataRenderer.java @@ -15,14 +15,14 @@
package com.redhat.rhn.frontend.action.renderers;
-import javax.servlet.http.HttpServletRequest; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.errata.ErrataFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.manager.errata.ErrataManager;
+import javax.servlet.http.HttpServletRequest; + /** * Renders YourRhn fragment for latest errata * diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java b/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java index cbfe4e8..39d917b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/RendererHelper.java @@ -15,6 +15,11 @@
package com.redhat.rhn.frontend.action.renderers;
+import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.frontend.action.renderers.io.CachingResponseWrapper; +import com.redhat.rhn.frontend.dto.SystemOverviewComparator; + import java.io.IOException; import java.util.Arrays;
@@ -23,11 +28,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse;
-import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.frontend.action.renderers.io.CachingResponseWrapper; -import com.redhat.rhn.frontend.dto.SystemOverviewComparator; - /** * General helper for fragment rendering * diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/SystemGroupsRenderer.java b/java/code/src/com/redhat/rhn/frontend/action/renderers/SystemGroupsRenderer.java index 5fa8c0f..5f47258 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/renderers/SystemGroupsRenderer.java +++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/SystemGroupsRenderer.java @@ -15,14 +15,14 @@
package com.redhat.rhn.frontend.action.renderers;
-import javax.servlet.http.HttpServletRequest; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; import com.redhat.rhn.manager.system.SystemManager;
+import javax.servlet.http.HttpServletRequest; + /** * Renders YourRhn fragment for system groups * diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/TasksRenderer.java b/java/code/src/com/redhat/rhn/frontend/action/renderers/TasksRenderer.java index 8160674..1be3e99 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/renderers/TasksRenderer.java +++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/TasksRenderer.java @@ -15,11 +15,11 @@
package com.redhat.rhn.frontend.action.renderers;
-import javax.servlet.http.HttpServletRequest; - import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.listview.PageControl;
+import javax.servlet.http.HttpServletRequest; + /** * Renders YourRhn fragment for tasks * diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/WarningProbesRenderer.java b/java/code/src/com/redhat/rhn/frontend/action/renderers/WarningProbesRenderer.java index 4a29ee3..ab3d86a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/renderers/WarningProbesRenderer.java +++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/WarningProbesRenderer.java @@ -15,10 +15,6 @@
package com.redhat.rhn.frontend.action.renderers;
-import java.util.Iterator; - -import javax.servlet.http.HttpServletRequest; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.monitoring.MonitoringConstants; import com.redhat.rhn.domain.user.User; @@ -27,6 +23,10 @@ import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; import com.redhat.rhn.manager.monitoring.MonitoringManager;
+import java.util.Iterator; + +import javax.servlet.http.HttpServletRequest; + /** * Renders YourRhn fragment for warning probes * 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 def9f47..0418cd4 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 @@ -14,19 +14,6 @@ */ package com.redhat.rhn.frontend.action.rhnpackage;
-import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.actions.LookupDispatchAction; - import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PatchSet; @@ -39,6 +26,19 @@ import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.actions.LookupDispatchAction; + +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * InstallPatchSetAction * @version $Rev$ 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 b5a54cb..206e72e 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 @@ -14,19 +14,6 @@ */ package com.redhat.rhn.frontend.action.rhnpackage;
-import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.actions.LookupDispatchAction; - import com.redhat.rhn.domain.action.rhnpackage.PackageAction; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; @@ -36,6 +23,19 @@ import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.actions.LookupDispatchAction; + +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * PackageIndexAction * @version $Rev$ 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 60933c4..54dd044 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 @@ -14,19 +14,6 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.patches;
-import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.actions.LookupDispatchAction; - import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.rhnset.RhnSet; @@ -38,6 +25,19 @@ import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.actions.LookupDispatchAction; + +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * ErrataConfirmAction * @version $Rev: 53116 $ 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 7914da4..a9e5571 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 @@ -14,19 +14,6 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.patches;
-import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.actions.LookupDispatchAction; - import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.rhnset.RhnSet; @@ -38,6 +25,19 @@ import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.actions.LookupDispatchAction; + +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * ErrataConfirmAction * @version $Rev: 53116 $ diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java index 13dd863..dbf4ef8 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareProfileSetupAction.java @@ -14,17 +14,6 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.profile;
-import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.rhnpackage.profile.Profile; import com.redhat.rhn.frontend.struts.RequestContext; @@ -36,6 +25,17 @@ import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; import com.redhat.rhn.frontend.taglibs.list.TagHelper; import com.redhat.rhn.manager.profile.ProfileManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * CompareProfileSetupAction * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java index 917d134..0479d70 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/CompareSystemSetupAction.java @@ -14,17 +14,6 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.profile;
-import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.frontend.struts.RequestContext; @@ -37,6 +26,17 @@ import com.redhat.rhn.frontend.taglibs.list.TagHelper; import com.redhat.rhn.manager.profile.ProfileManager; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * CompareSystemSetupAction * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageSetupAction.java index 9d5ba0d..b2f1e22 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageSetupAction.java @@ -14,15 +14,6 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.profile;
-import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.rhnpackage.profile.Profile; import com.redhat.rhn.domain.server.Server; @@ -34,6 +25,15 @@ import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; import com.redhat.rhn.manager.profile.ProfileManager; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * MissingPackageSetupAction * @version $Rev$ 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 97c2cf6..182fcf9 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 @@ -14,17 +14,6 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.profile;
-import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - import com.redhat.rhn.domain.rhnpackage.profile.Profile; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; @@ -33,6 +22,17 @@ import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.profile.ProfileManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * This action will present the user with a list of all stored profiles * and allow one to be seleted. 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 3460499..2edc676 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 @@ -14,20 +14,23 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.profile;
-import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; +import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnHelper; import com.redhat.rhn.frontend.struts.RhnListAction; import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.frontend.taglibs.list.helper.Listable; -import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.profile.ProfileManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * This action will present the user with a list of all stored profiles * and allow one to be seleted. 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 88035e4..cc8917c 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 @@ -14,8 +14,6 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.profile;
-import java.util.Set; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.util.DatePicker; import com.redhat.rhn.domain.rhnpackage.profile.Profile; @@ -33,6 +31,8 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.DynaActionForm;
+import java.util.Set; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse;
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 622be10..972d78b 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 @@ -14,8 +14,6 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.profile;
-import java.util.Set; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.util.DatePicker; import com.redhat.rhn.domain.server.Server; @@ -32,6 +30,8 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.DynaActionForm;
+import java.util.Set; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/test/SyncActionsTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/test/SyncActionsTest.java index 6ee8779..c69e692 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/test/SyncActionsTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/test/SyncActionsTest.java @@ -14,8 +14,6 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.profile.test;
-import java.util.Set; - import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; @@ -33,6 +31,8 @@ import com.redhat.rhn.manager.rhnpackage.test.PackageManagerTest; import com.redhat.rhn.testing.RhnMockStrutsTestCase; import com.redhat.rhn.testing.UserTestUtils;
+import java.util.Set; + /** * @author mmccune * 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 25ca7af..1577bf5 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 @@ -14,19 +14,6 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.ssm;
-import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.action.DynaActionForm; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.util.DatePicker; @@ -42,8 +29,24 @@ import com.redhat.rhn.frontend.struts.SessionSetHelper; import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.frontend.taglibs.list.helper.Listable; -import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.action.ActionManager; +import com.redhat.rhn.manager.system.SystemManager; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.action.DynaActionForm; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** * SSM action that handles prompting the user for when to install the package as well 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 2003163..b2670b9 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 @@ -14,41 +14,44 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.ssm;
-import java.util.Set; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.Date; -import java.util.Iterator; -import java.util.HashSet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.DynaActionForm; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.action.ActionMessage; -import com.redhat.rhn.frontend.struts.RhnListAction; +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.util.DatePicker; +import com.redhat.rhn.domain.rhnset.RhnSet; +import com.redhat.rhn.domain.rhnset.SetCleanup; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.dto.PackageListItem; import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.SessionSetHelper; import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.frontend.struts.RhnListAction; +import com.redhat.rhn.frontend.struts.SessionSetHelper; import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.taglibs.list.helper.Listable; -import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.frontend.taglibs.list.TagHelper; -import com.redhat.rhn.frontend.dto.PackageListItem; -import com.redhat.rhn.common.util.DatePicker; -import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.manager.rhnset.RhnSetManager; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; +import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; +import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.system.SystemManager; -import com.redhat.rhn.manager.action.ActionManager; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.domain.rhnset.SetCleanup; -import com.redhat.rhn.domain.rhnset.RhnSet; -import com.redhat.rhn.domain.server.Server; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.action.DynaActionForm; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** * Handles the display and capture of scheduling package removals for systems in the SSM. 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 0879916..bbaecea 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 @@ -14,42 +14,45 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.ssm;
-import java.util.List; -import java.util.Set; -import java.util.ArrayList; -import java.util.Map; -import java.util.Date; -import java.util.Iterator; -import java.util.HashMap; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.DynaActionForm; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.action.ActionMessage; -import org.apache.commons.lang.StringUtils; -import com.redhat.rhn.frontend.taglibs.list.helper.Listable; -import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; -import com.redhat.rhn.frontend.taglibs.list.TagHelper; -import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.RhnHelper; -import com.redhat.rhn.frontend.struts.SessionSetHelper; -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.dto.PackageListItem; -import com.redhat.rhn.common.util.DatePicker; import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.common.util.DatePicker; +import com.redhat.rhn.domain.rhnpackage.PackageEvr; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.SetCleanup; import com.redhat.rhn.domain.server.Server; -import com.redhat.rhn.domain.rhnpackage.PackageEvr; -import com.redhat.rhn.manager.rhnset.RhnSetManager; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.dto.PackageListItem; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.frontend.struts.SessionSetHelper; +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.frontend.taglibs.list.TagHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; +import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; +import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.system.SystemManager; -import com.redhat.rhn.manager.action.ActionManager; + +import org.apache.commons.lang.StringUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.action.DynaActionForm; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** * @version $Revision$ 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 e9394b4..48ff23c 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 @@ -14,40 +14,43 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.ssm;
-import java.util.List; -import java.util.Set; -import java.util.ArrayList; -import java.util.Map; -import java.util.Date; -import java.util.Iterator; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.DynaActionForm; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.action.ActionMessage; -import com.redhat.rhn.frontend.struts.RhnAction; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.RhnHelper; -import com.redhat.rhn.frontend.struts.SessionSetHelper; -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.taglibs.list.helper.Listable; -import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; -import com.redhat.rhn.frontend.taglibs.list.TagHelper; -import com.redhat.rhn.frontend.dto.PackageListItem; -import com.redhat.rhn.common.util.DatePicker; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.common.util.DatePicker; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.SetCleanup; import com.redhat.rhn.domain.server.Server; -import com.redhat.rhn.manager.rhnset.RhnSetManager; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.dto.PackageListItem; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.frontend.struts.SessionSetHelper; +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.frontend.taglibs.list.TagHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; +import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; +import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.system.SystemManager; -import com.redhat.rhn.manager.action.ActionManager; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.action.DynaActionForm; + +import java.util.ArrayList; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** * Handles the display and capturing of scheduling package verifications for systems in diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java index cf11e06..c8b52e5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java @@ -14,22 +14,25 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.ssm;
-import java.util.HashMap; -import java.util.Map; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnHelper; import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.frontend.taglibs.list.helper.ListSessionSetHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.channel.ChannelManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * SSM action for selecting the packages to install. Package list is determined by the * first step in the flow where the channel is selected. 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 92d8db3..e048ee0 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 @@ -14,22 +14,25 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.ssm;
-import java.util.List; -import java.util.Map; -import java.util.HashMap; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionForm; -import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnHelper; -import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.frontend.taglibs.list.helper.ListSessionSetHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.rhnpackage.PackageManager; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.common.db.datasource.DataResult; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** * Handles listing and selecting a number of packages to remove from systems in the SSM. 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 fef07fa..bdda560 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 @@ -14,24 +14,27 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.ssm;
-import java.util.List; -import java.util.Map; -import java.util.HashMap; -import java.util.Set; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionForm; -import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnHelper; import com.redhat.rhn.frontend.struts.SessionSetHelper; -import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.frontend.taglibs.list.helper.ListSessionSetHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.rhnpackage.PackageManager; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.common.db.datasource.DataResult; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** * @version $Revision$ 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 003460b..2add58d 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 @@ -14,23 +14,26 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.ssm;
-import java.util.List; -import java.util.Map; -import java.util.HashMap; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionForm; -import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnHelper; -import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.frontend.taglibs.list.helper.ListSessionSetHelper; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.rhnpackage.PackageManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * Handles the listing of packages on systems in the SSM that can be verified. * diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectRemovePackagesActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectRemovePackagesActionTest.java index 2a138ea..1ffe4e4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectRemovePackagesActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectRemovePackagesActionTest.java @@ -14,11 +14,11 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.ssm.test;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase; import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.frontend.taglibs.list.TagHelper; import com.redhat.rhn.frontend.taglibs.list.ListTagUtil; +import com.redhat.rhn.frontend.taglibs.list.TagHelper; import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.testing.RhnMockStrutsTestCase;
/** * @version $Revision$ diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectVerifyPackagesActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectVerifyPackagesActionTest.java index 75528bf..75665d3 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectVerifyPackagesActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SelectVerifyPackagesActionTest.java @@ -14,11 +14,11 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.ssm.test;
-import com.redhat.rhn.testing.RhnMockStrutsTestCase; import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.frontend.taglibs.list.TagHelper; import com.redhat.rhn.frontend.taglibs.list.ListTagUtil; +import com.redhat.rhn.frontend.taglibs.list.TagHelper; import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.testing.RhnMockStrutsTestCase;
/** * @version $Revision$ diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SsmActionTestUtils.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SsmActionTestUtils.java index c38596b..a3a2354 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SsmActionTestUtils.java +++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/test/SsmActionTestUtils.java @@ -14,22 +14,24 @@ */ package com.redhat.rhn.frontend.action.rhnpackage.ssm.test;
-import java.util.Map; -import java.util.HashMap; -import junit.framework.TestCase; +import com.redhat.rhn.common.db.datasource.ModeFactory; +import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.domain.org.Org; -import com.redhat.rhn.domain.server.Server; -import com.redhat.rhn.domain.server.ServerFactory; -import com.redhat.rhn.domain.rhnpackage.test.PackageTest; import com.redhat.rhn.domain.rhnpackage.Package; +import com.redhat.rhn.domain.rhnpackage.test.PackageTest; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.SetCleanup; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.testing.ServerTestUtils; -import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; -import com.redhat.rhn.common.db.datasource.WriteMode; -import com.redhat.rhn.common.db.datasource.ModeFactory; +import com.redhat.rhn.manager.rhnset.RhnSetManager; +import com.redhat.rhn.testing.ServerTestUtils; + +import java.util.HashMap; +import java.util.Map; + +import junit.framework.TestCase;
/** * @version $Revision$ diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/BaseConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/BaseConfigAction.java index 1c13c14..cd32662 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/BaseConfigAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/BaseConfigAction.java @@ -18,10 +18,10 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.satellite.SatelliteConfigurator;
-import org.apache.log4j.Logger; - import net.sf.cglib.core.ReflectUtils;
+import org.apache.log4j.Logger; + /** * BaseConfigAction - contains common methods for Struts Actions needing to * config a sat. diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java index 7063a85..c4401e3 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/BootstrapConfigAction.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.satellite;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnValidationHelper; @@ -95,7 +96,7 @@ public class BootstrapConfigAction extends BaseConfigAction { } } else { - form.set(HOSTNAME, Config.get().getString(Config.JABBER_SERVER)); + form.set(HOSTNAME, Config.get().getString(ConfigDefaults.JABBER_SERVER)); form.set(SSL_CERT, DEFAULT_CERT_PATH); form.set(ENABLE_SSL, Boolean.TRUE); form.set(ENABLE_GPG, Boolean.TRUE); diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java index c8e3d73..5a051f5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.satellite;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; @@ -58,7 +59,8 @@ public class GeneralConfigAction extends BaseConfigAction { "mount_point"};
private static final String[] BOOLEAN_CONFIG_ARRAY = {"web.ssl_available", - "web.enable_solaris_support", Config.DISCONNECTED, "web.is_monitoring_backend"}; + "web.enable_solaris_support", ConfigDefaults.DISCONNECTED, + "web.is_monitoring_backend"};
private static final List COMBO_LIST = new LinkedList(); static { 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 8e42d34..85776b4 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 @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.satellite;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.monitoring.config.ConfigMacro; @@ -97,7 +98,7 @@ public class MonitoringConfigAction extends BaseConfigAction {
if (isSubmitted(form)) { ConfigureSatelliteCommand csc = (ConfigureSatelliteCommand) getCommand(user); - csc.updateBoolean(Config.WEB_IS_MONITORING_SCOUT, + csc.updateBoolean(ConfigDefaults.WEB_IS_MONITORING_SCOUT, (Boolean) form.get(IS_MONITORING_SCOUT)); if (csc.getKeysToBeUpdated().size() > 0) { valuesChanged = true; @@ -121,7 +122,8 @@ public class MonitoringConfigAction extends BaseConfigAction { } else { form.set(IS_MONITORING_SCOUT, - new Boolean(Config.get().getBoolean(Config.WEB_IS_MONITORING_SCOUT))); + new Boolean(Config.get().getBoolean( + ConfigDefaults.WEB_IS_MONITORING_SCOUT))); }
req.setAttribute("configList", nameDescVals); diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java index 7d923a5..fb7075f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/BootstrapConfigActionTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.satellite.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.frontend.action.satellite.BootstrapConfigAction; import com.redhat.rhn.frontend.struts.RhnAction; @@ -41,10 +42,10 @@ public class BootstrapConfigActionTest extends RhnMockStrutsTestCase { }
public void testNonSubmitExecute() throws Exception { - String expectedHostname = Config.get().getString(Config.JABBER_SERVER); + String expectedHostname = Config.get().getString(ConfigDefaults.JABBER_SERVER); if (expectedHostname == null) { expectedHostname = "localhost"; - Config.get().setString(Config.JABBER_SERVER, expectedHostname); + Config.get().setString(ConfigDefaults.JABBER_SERVER, expectedHostname); } addRequestParameter(RhnAction.SUBMITTED, Boolean.FALSE.toString()); setRequestPathInfo("/admin/config/BootstrapConfig"); @@ -71,10 +72,10 @@ public class BootstrapConfigActionTest extends RhnMockStrutsTestCase {
public void testSubmitExecute() throws Exception {
- String expectedHostname = Config.get().getString(Config.JABBER_SERVER); + String expectedHostname = Config.get().getString(ConfigDefaults.JABBER_SERVER); if (expectedHostname == null) { expectedHostname = "localhost"; - Config.get().setString(Config.JABBER_SERVER, expectedHostname); + Config.get().setString(ConfigDefaults.JABBER_SERVER, expectedHostname); }
addRequestParameter(RhnAction.SUBMITTED, Boolean.TRUE.toString()); diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/MonitoringConfigActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/MonitoringConfigActionTest.java index b5bd23b..f80b4dd 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/satellite/test/MonitoringConfigActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/test/MonitoringConfigActionTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.satellite.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.monitoring.config.ConfigMacro; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.user.User; @@ -89,7 +90,8 @@ public class MonitoringConfigActionTest extends RhnBaseTestCase { // If this is in HOSTED, dont run the test
ah.getForm().set(MonitoringConfigAction.SUBMITTED, new Boolean(true)); - boolean oldScoutValue = Config.get().getBoolean(Config.WEB_IS_MONITORING_SCOUT); + boolean oldScoutValue = Config.get().getBoolean( + ConfigDefaults.WEB_IS_MONITORING_SCOUT); ah.getForm().set(MonitoringConfigAction.IS_MONITORING_SCOUT, new Boolean(!oldScoutValue)); User user = ah.getUser(); @@ -115,7 +117,7 @@ public class MonitoringConfigActionTest extends RhnBaseTestCase { ActionForward af = ah.executeAction(); assertTrue(restartCalled); assertEquals(!oldScoutValue, - Config.get().getBoolean(Config.WEB_IS_MONITORING_SCOUT)); + Config.get().getBoolean(ConfigDefaults.WEB_IS_MONITORING_SCOUT)); assertEquals("default", af.getName()); assertNotNull(ah.getRequest().getAttribute("configList"));
@@ -134,7 +136,7 @@ public class MonitoringConfigActionTest extends RhnBaseTestCase { } assertTrue(changed); assertTrue(TestUtils.validateUIMessage(ah, "monitoring.services.restarted")); - Config.get().setBoolean(Config.WEB_IS_MONITORING_SCOUT, + Config.get().setBoolean(ConfigDefaults.WEB_IS_MONITORING_SCOUT, new Boolean(oldScoutValue).toString()); }
@@ -143,7 +145,7 @@ public class MonitoringConfigActionTest extends RhnBaseTestCase { ah.getForm().set(MonitoringConfigAction.SUBMITTED, new Boolean(true)); ah.getForm().set(MonitoringConfigAction.IS_MONITORING_SCOUT, new Boolean(Config.get().getBoolean( - Config.WEB_IS_MONITORING_SCOUT))); + ConfigDefaults.WEB_IS_MONITORING_SCOUT))); setupExpectedProperties(ah); ah.executeAction(); assertTrue(TestUtils.validateUIMessage(ah, "monitoring.services.novalueschanged")); 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 8dcb418..abfdff4 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 @@ -14,17 +14,6 @@ */ package com.redhat.rhn.frontend.action.schedule;
-import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.user.User; @@ -33,6 +22,17 @@ import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; + +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * FailedSystemsAction * @version $Rev$ 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 61dcdbf..76726fc 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 @@ -14,17 +14,6 @@ */ package com.redhat.rhn.frontend.action.schedule;
-import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.action.Action; @@ -36,6 +25,17 @@ import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; + +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * InProgressSystemsAction * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/BaseViewLogAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/BaseViewLogAction.java index 31c3009..db816ae 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/ssm/BaseViewLogAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/BaseViewLogAction.java @@ -14,16 +14,18 @@ */ package com.redhat.rhn.frontend.action.ssm;
-import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; import com.redhat.rhn.frontend.struts.RhnHelper; import com.redhat.rhn.frontend.struts.RhnListAction; import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * Responsible for populating the request to display a list of SSM operation log * entries. The simplest way to use this class is to subclass it and call the setters 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 5fc8ad0..5465c54 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 @@ -14,11 +14,12 @@ */ package com.redhat.rhn.frontend.action.ssm;
-import java.util.List; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.manager.ssm.SsmOperationManager; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.manager.ssm.SsmOperationManager; + +import java.util.List;
/** * Configures the {@link BaseViewLogAction} and its pages to display all operation 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 320422b..2820a07 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 @@ -14,12 +14,13 @@ */ package com.redhat.rhn.frontend.action.ssm;
-import java.util.List; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.domain.user.User; import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.ssm.SsmOperationManager;
+import java.util.List; + /** @version $Revision$ */ public class ViewCompletedLogAction extends BaseViewLogAction {
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 6295ba9..38b1f2e 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 @@ -14,12 +14,13 @@ */ package com.redhat.rhn.frontend.action.ssm;
-import java.util.List; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.domain.user.User; import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.ssm.SsmOperationManager;
+import java.util.List; + /** * Configures the {@link BaseViewLogAction} and its pages to display in progress operation * log entries for the current user. 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 1c8e377..52d745c 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 @@ -14,22 +14,25 @@ */ package com.redhat.rhn.frontend.action.ssm;
-import java.util.List; -import java.util.Map; -import java.util.HashMap; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.RhnListAction; import com.redhat.rhn.frontend.struts.RhnHelper; -import com.redhat.rhn.frontend.taglibs.list.helper.Listable; +import com.redhat.rhn.frontend.struts.RhnListAction; import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.ssm.SsmOperationManager; -import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.domain.user.User; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** * Loads the data for a particular SSM operation (identified by its ID in diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java index 2186b21..afd55b9 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.systems;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.user.User; @@ -170,7 +171,7 @@ public class SystemListHelper {
private static boolean checkinOverdue(SystemOverview systemData) { Long threshold = new Long(Config.get().getInt( - Config.SYSTEM_CHECKIN_THRESHOLD)); + ConfigDefaults.SYSTEM_CHECKIN_THRESHOLD));
if (systemData.getLastCheckinDaysAgo() != null && systemData.getLastCheckinDaysAgo().compareTo(threshold) > 0) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java index dbaddb2..3c82126 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java @@ -15,12 +15,12 @@ package com.redhat.rhn.frontend.action.systems;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.hibernate.LookupException; import com.redhat.rhn.common.validator.ValidatorException; -import com.redhat.rhn.domain.rhnpackage.PackageFactory; import com.redhat.rhn.domain.rhnpackage.Package; +import com.redhat.rhn.domain.rhnpackage.PackageFactory; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.session.WebSession; import com.redhat.rhn.domain.user.User; @@ -206,7 +206,8 @@ public class SystemSearchHelper {
log.info("Performing system search: index = " + index + ", query = " + query); - XmlRpcClient client = new XmlRpcClient(Config.get().getSearchServerUrl(), true); + XmlRpcClient client = new XmlRpcClient( + ConfigDefaults.get().getSearchServerUrl(), true); List args = new ArrayList(); args.add(sessionId); args.add(index); 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 11b8efa..c921520 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 @@ -14,44 +14,26 @@ */ package com.redhat.rhn.frontend.action.systems.entitlements;
-import java.util.Iterator; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.redhat.rhn.common.db.datasource.DataResult; - import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorResult; - import com.redhat.rhn.domain.entitlement.Entitlement; import com.redhat.rhn.domain.entitlement.VirtualizationEntitlement; - import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.RhnSetElement; - import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerGroup; - import com.redhat.rhn.domain.user.User; - import com.redhat.rhn.frontend.action.common.BaseSetOperateOnSelectedItemsAction; - import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.StrutsDelegate; - import com.redhat.rhn.manager.entitlement.EntitlementManager; - import com.redhat.rhn.manager.monitoring.ScoutConfigPushCommand; - import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; - import com.redhat.rhn.manager.system.SystemManager;
import org.apache.log4j.Logger; - import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -59,6 +41,12 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.action.DynaActionForm;
+import java.util.Iterator; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * Class representing the submit action of the Systeme Eintitlements page * SystemEntitlementsSubmitAction diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSetupActionTest.java index fbb11ca..7938dfb 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSetupActionTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.systems.entitlements.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.role.RoleFactory; @@ -183,7 +184,7 @@ public class SystemEntitlementsSetupActionTest extends RhnMockStrutsTestCase { user.addRole(RoleFactory.ORG_ADMIN); user.getOrg().getEntitlements().add( OrgFactory.lookupEntitlementByLabel("rhn_monitor")); - Config.get().setBoolean(Config.WEB_IS_MONITORING_BACKEND, "1"); + Config.get().setBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND, "1"); }
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java index 78ef603..589174a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/entitlements/test/SystemEntitlementsSubmitActionTest.java @@ -14,8 +14,6 @@ */ package com.redhat.rhn.frontend.action.systems.entitlements.test;
-import java.util.Iterator; - import com.redhat.rhn.domain.entitlement.Entitlement; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.server.EntitlementServerGroup; @@ -35,6 +33,8 @@ import com.redhat.rhn.testing.ServerGroupTestUtils; import com.redhat.rhn.testing.ServerTestUtils; import com.redhat.rhn.testing.TestUtils;
+import java.util.Iterator; + /** * * SystemEntitlementSubmitActionToast diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeAction.java index 1a974e9..381bd38 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeAction.java @@ -14,26 +14,6 @@ */ package com.redhat.rhn.frontend.action.systems.monitoring;
-import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.collections.Transformer; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.action.DynaActionForm; -import org.apache.struts.util.LabelValueBean; - import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.monitoring.Probe; import com.redhat.rhn.domain.monitoring.command.Command; @@ -48,6 +28,26 @@ import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnValidationHelper; import com.redhat.rhn.manager.monitoring.ModifyProbeCommand;
+import org.apache.commons.collections.Transformer; +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.action.DynaActionForm; +import org.apache.struts.util.LabelValueBean; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + /** * Action for the probe details page. Note that there is no correpsonding * SetupAction since there isn't really a good separation between setup diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java index 858206d..1b94c2e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/BaseProbeCreateAction.java @@ -14,6 +14,26 @@ */ package com.redhat.rhn.frontend.action.systems.monitoring;
+import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.domain.monitoring.MonitoringFactory; +import com.redhat.rhn.domain.monitoring.Probe; +import com.redhat.rhn.domain.monitoring.command.Command; +import com.redhat.rhn.domain.monitoring.command.CommandGroup; +import com.redhat.rhn.domain.monitoring.satcluster.SatClusterFactory; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.manager.monitoring.ModifyProbeCommand; +import com.redhat.rhn.manager.monitoring.MonitoringManager; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.Transformer; +import org.apache.commons.lang.StringUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; +import org.apache.struts.util.LabelValueBean; + import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -27,26 +47,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession;
-import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.Transformer; -import org.apache.commons.lang.StringUtils; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.DynaActionForm; -import org.apache.struts.util.LabelValueBean; - -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.domain.monitoring.MonitoringFactory; -import com.redhat.rhn.domain.monitoring.Probe; -import com.redhat.rhn.domain.monitoring.command.Command; -import com.redhat.rhn.domain.monitoring.command.CommandGroup; -import com.redhat.rhn.domain.monitoring.satcluster.SatClusterFactory; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.manager.monitoring.ModifyProbeCommand; -import com.redhat.rhn.manager.monitoring.MonitoringManager; - /** * BaseProbeCreateAction * @version $Rev: 75283 $ 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 0c5779d..defbea0 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 @@ -14,8 +14,12 @@ */ package com.redhat.rhn.frontend.action.systems.provisioning.kickstart;
-import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.action.kickstart.KickstartVariableAction; +import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper;
import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -24,12 +28,8 @@ import org.apache.struts.action.DynaActionForm; import org.cobbler.CobblerObject; import org.cobbler.SystemRecord;
-import com.redhat.rhn.domain.server.Server; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.action.kickstart.KickstartVariableAction; -import com.redhat.rhn.frontend.action.systems.sdc.SdcHelper; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** 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 a21c928..58a008f 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 @@ -14,18 +14,6 @@ */ package com.redhat.rhn.frontend.action.systems.sdc;
-import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; - import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; @@ -37,6 +25,18 @@ import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; + +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * SystemOverviewAction * @version $Rev$ 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 4fc3f74..14b891c 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 @@ -14,18 +14,6 @@ */ package com.redhat.rhn.frontend.action.systems.sdc;
-import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; - import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; @@ -37,6 +25,18 @@ import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; + +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * SystemOverviewAction * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SdcHelper.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SdcHelper.java index 2680db1..5ebb488 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SdcHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SdcHelper.java @@ -14,12 +14,12 @@ */ package com.redhat.rhn.frontend.action.systems.sdc;
-import javax.servlet.http.HttpServletRequest; - import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.rhnset.RhnSetDecl;
+import javax.servlet.http.HttpServletRequest; + /** * * SdcHelper 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 8b28f7a..d2ecae3 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 @@ -14,25 +14,9 @@ */ package com.redhat.rhn.frontend.action.systems.sdc;
-import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.DynaActionForm; - +import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.util.DynamicComparator; import com.redhat.rhn.common.validator.ValidatorError; -import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; @@ -47,6 +31,22 @@ import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.system.UpdateBaseChannelCommand; import com.redhat.rhn.manager.system.UpdateChildChannelsCommand;
+import org.apache.log4j.Logger; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; + +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +
/** * SystemChannelsAction - action to setup/process viewing a system's channel subscription 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 89599b3..d2e8f8d 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 @@ -14,61 +14,47 @@ */ package com.redhat.rhn.frontend.action.systems.sdc;
-import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.redhat.rhn.common.localization.LocalizationService; - import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorResult; import com.redhat.rhn.common.validator.ValidatorWarning; - import com.redhat.rhn.domain.entitlement.Entitlement; import com.redhat.rhn.domain.entitlement.VirtualizationEntitlement; - import com.redhat.rhn.domain.org.Org; - import com.redhat.rhn.domain.role.RoleFactory; - import com.redhat.rhn.domain.server.Location; import com.redhat.rhn.domain.server.Server; - import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.user.UserServerPreferenceId; - import com.redhat.rhn.frontend.dto.EntitlementDto; - import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnValidationHelper; - import com.redhat.rhn.manager.action.ActionManager; - import com.redhat.rhn.manager.entitlement.EntitlementManager; - import com.redhat.rhn.manager.system.SystemManager; - import com.redhat.rhn.manager.user.UserManager;
import org.apache.log4j.Logger; - import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.action.DynaActionForm; - import org.apache.struts.util.LabelValueBean;
+import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * SystemDetailsEditAction * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsForm.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsForm.java index 9bd12a6..548b799 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsForm.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsForm.java @@ -14,13 +14,13 @@ */ package com.redhat.rhn.frontend.action.systems.sdc;
-import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; +import com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm;
import org.apache.commons.lang.ArrayUtils;
-import com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List;
/** * 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 eac7d0b..7afe2a7 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 @@ -14,21 +14,6 @@ */ package com.redhat.rhn.frontend.action.systems.sdc;
-import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.util.DynamicComparator; @@ -44,9 +29,24 @@ import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.monitoring.MonitoringManager; +import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.user.UserManager; -import com.redhat.rhn.manager.rhnpackage.PackageManager; + +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** * SystemOverviewAction diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemOverviewActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemOverviewActionTest.java index 2934842..a1295e7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemOverviewActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/test/SystemOverviewActionTest.java @@ -14,10 +14,6 @@ */ package com.redhat.rhn.frontend.action.systems.sdc.test;
-import java.sql.Timestamp; -import java.util.Calendar; -import java.util.Date; - import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.errata.ErrataFactory; import com.redhat.rhn.domain.errata.test.ErrataFactoryTest; @@ -34,6 +30,10 @@ import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.testing.RhnMockStrutsTestCase; import com.redhat.rhn.testing.TestUtils;
+import java.sql.Timestamp; +import java.util.Calendar; +import java.util.Date; + /** * SystemOverviewActionTest * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java index 3db6ecb..626df4f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataActionTest.java @@ -20,6 +20,7 @@ import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.channel.test.ChannelFactoryTest; import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.errata.test.ErrataFactoryTest; +import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.test.ServerFactoryTest; @@ -30,7 +31,6 @@ import com.redhat.rhn.manager.errata.cache.ErrataCacheManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.testing.RhnMockStrutsTestCase; -import com.redhat.rhn.domain.rhnpackage.Package;
/** * ErrataActionTest diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataSetupActionTest.java index f3d3fc0..4659f1c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/ErrataSetupActionTest.java @@ -16,12 +16,12 @@ package com.redhat.rhn.frontend.action.systems.test;
import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.errata.test.ErrataFactoryTest; +import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.errata.cache.ErrataCacheManager; import com.redhat.rhn.testing.RhnMockStrutsTestCase; -import com.redhat.rhn.domain.rhnpackage.Package;
import java.util.Iterator;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java index b092d46..fa2e91f 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemListSetupActionTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.systems.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.role.RoleFactory; @@ -83,7 +84,7 @@ public class SystemListSetupActionTest extends RhnMockStrutsTestCase { } assertTrue(isThere);
- int secondsOld = Config.get().getInt(Config.SYSTEM_CHECKIN_THRESHOLD) * + int secondsOld = Config.get().getInt(ConfigDefaults.SYSTEM_CHECKIN_THRESHOLD) * 86400000 + 50000000; //awol Date now = new Date(); diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchSetupActionTest.java index 4e47b2a..d45bd9a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/test/SystemSearchSetupActionTest.java @@ -14,8 +14,6 @@ */ package com.redhat.rhn.frontend.action.systems.test;
-import org.apache.struts.action.DynaActionForm; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.org.OrgFactory; import com.redhat.rhn.domain.server.Server; @@ -26,6 +24,8 @@ import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.testing.RhnMockStrutsTestCase;
+import org.apache.struts.action.DynaActionForm; + /** * SystemSearchActionTest * @version $Rev: 1 $ diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java index 9b15cae..e901d9e 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java @@ -14,23 +14,6 @@ */ package com.redhat.rhn.frontend.action.systems.virtualization;
-import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.DynaActionForm; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.validator.ValidatorError; @@ -42,11 +25,28 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.systems.BaseSystemListAction; import com.redhat.rhn.frontend.dto.VirtualSystemOverview; import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.frontend.struts.RhnValidationHelper; +import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.system.SystemManager;
+import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; +import org.apache.struts.action.DynaActionForm; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * VirtualGuestsListAction * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java index 944fe13..29be895 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/test/ProvisionVirtualizationWizardActionTest.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.frontend.action.systems.virtualization.test;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.test.ChannelFactoryTest; import com.redhat.rhn.domain.kickstart.KickstartData; @@ -68,7 +68,7 @@ public class ProvisionVirtualizationWizardActionTest extends RhnMockStrutsTestCa s.addChannel(c);
PackageManagerTest.addPackageToSystemAndChannel( - Config.get().getKickstartPackageName(), s, c); + ConfigDefaults.get().getKickstartPackageName(), s, c); TestUtils.saveAndFlush(s); TestUtils.saveAndFlush(c);
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 bc02ca5..70bd8a4 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 @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.user;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.role.Role; @@ -92,7 +93,7 @@ public class AdminUserEditAction extends UserEditActionHelper { * accordingly. (we don't want to set this field if it wasn't displayed or if the * user doesn't have access to set this attribute) */ - String pamAuthService = Config.get().getString(Config.WEB_PAM_AUTH_SERVICE); + String pamAuthService = Config.get().getString(ConfigDefaults.WEB_PAM_AUTH_SERVICE); if (pamAuthService != null && pamAuthService.trim().length() > 0 && loggedInUser.hasRole(RoleFactory.ORG_ADMIN)) { diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java index 0ffbdc7..f625fa5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/CreateUserSetupAction.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.user;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.frontend.struts.RhnValidationHelper; @@ -70,7 +71,7 @@ public class CreateUserSetupAction extends RhnAction { * If we are a sat and we have setup pam authentication already, display the * checkbox and instructions */ - String pamAuthService = Config.get().getString(Config.WEB_PAM_AUTH_SERVICE); + String pamAuthService = Config.get().getString(ConfigDefaults.WEB_PAM_AUTH_SERVICE); if (pamAuthService != null && pamAuthService.trim().length() > 0) { request.setAttribute("displaypamcheckbox", "true"); } 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 24b4894..a7fcf28 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 @@ -14,20 +14,20 @@ */ package com.redhat.rhn.frontend.action.user;
+import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.struts.RhnHelper; import com.redhat.rhn.frontend.struts.RhnListSetHelper; -import com.redhat.rhn.manager.rhnset.RhnSetDecl; -import com.redhat.rhn.manager.user.UserManager; -import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; import com.redhat.rhn.frontend.taglibs.list.TagHelper; +import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; -import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.manager.user.UserManager;
import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -35,14 +35,13 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages;
-import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import java.util.Collections; - import java.util.HashMap; import java.util.Map;
+import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * DisabledListSetupAction * @version $Rev$ 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 9c7dd7c..d492334 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 @@ -17,34 +17,34 @@ package com.redhat.rhn.frontend.action.user; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.security.PermissionException; +import com.redhat.rhn.common.security.user.StateChangeException; +import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.dto.UserOverview; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnHelper; import com.redhat.rhn.frontend.struts.RhnListAction; import com.redhat.rhn.frontend.struts.RhnListSetHelper; -import com.redhat.rhn.manager.user.UserManager; -import com.redhat.rhn.manager.rhnset.RhnSetDecl; -import com.redhat.rhn.domain.rhnset.RhnSet; -import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.dto.UserOverview; -import com.redhat.rhn.common.security.user.StateChangeException; +import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; +import com.redhat.rhn.manager.rhnset.RhnSetDecl; +import com.redhat.rhn.manager.user.UserManager;
-import org.apache.struts.action.ActionMessages; -import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages;
+import java.util.Collections; import java.util.Iterator; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse;
-import java.util.Collections; - /** * EnableConfirmSetupAction * @version $Rev$ 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 9007199..551aa49 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 @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.user;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.role.Role; import com.redhat.rhn.domain.role.RoleFactory; @@ -104,7 +105,8 @@ public class UserEditSetupAction extends RhnAction { request.setAttribute("self", new Boolean(loggedInUser.equals(targetUser)));
//Should we display the pam checkbox? - String pamAuthService = Config.get().getString(Config.WEB_PAM_AUTH_SERVICE); + String pamAuthService = Config.get().getString( + ConfigDefaults.WEB_PAM_AUTH_SERVICE); if (pamAuthService != null && pamAuthService.trim().length() > 0) { request.setAttribute("displaypam", "true"); form.set("usepam", new Boolean(targetUser.getUsePamAuthentication())); diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/UserListAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/UserListAction.java index 93abcbf..6eff7d2 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/UserListAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/UserListAction.java @@ -14,20 +14,20 @@ */ package com.redhat.rhn.frontend.action.user;
-import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.StrutsDelegate; +import com.redhat.rhn.frontend.taglibs.ListDisplayTag;
import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.actions.LookupDispatchAction;
-import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.StrutsDelegate; -import com.redhat.rhn.frontend.taglibs.ListDisplayTag; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** * UserListAction diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/test/EnableConfirmSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/user/test/EnableConfirmSetupActionTest.java index 9b966c7..811b7b4 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/test/EnableConfirmSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/test/EnableConfirmSetupActionTest.java @@ -20,13 +20,13 @@ import com.redhat.rhn.domain.user.StateChange; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.frontend.action.user.EnableConfirmSetupAction; +import com.redhat.rhn.frontend.taglibs.list.ListTagUtil; +import com.redhat.rhn.frontend.taglibs.list.TagHelper; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.testing.ActionHelper; import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.UserTestUtils; -import com.redhat.rhn.frontend.taglibs.list.ListTagUtil; -import com.redhat.rhn.frontend.taglibs.list.TagHelper;
import org.apache.struts.action.ActionForward;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java index b70cd02..361e1e7 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/test/UserEditSetupActionTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.user.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.role.Role; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.user.User; @@ -79,7 +80,8 @@ public class UserEditSetupActionTest extends RhnBaseTestCase { assertTrue(sah.getRequest().getAttribute("user") instanceof User);
//If we have pam setup where we're testing, make sure displaypam was set - String pamAuthService = Config.get().getString(Config.WEB_PAM_AUTH_SERVICE); + String pamAuthService = Config.get().getString( + ConfigDefaults.WEB_PAM_AUTH_SERVICE); if (pamAuthService != null && pamAuthService.trim().length() > 0) { assertNotNull(sah.getRequest().getAttribute("displaypam")); } diff --git a/java/code/src/com/redhat/rhn/frontend/dto/OrgTrust.java b/java/code/src/com/redhat/rhn/frontend/dto/OrgTrust.java index 1fb31fe..97cf34c 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/OrgTrust.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/OrgTrust.java @@ -14,11 +14,11 @@ */ package com.redhat.rhn.frontend.dto;
+import com.redhat.rhn.domain.org.Org; + import java.util.ArrayList; import java.util.List;
-import com.redhat.rhn.domain.org.Org; - /** * @version $Rev: 101893 $ */ diff --git a/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java b/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java index 774ef80..81ecac9 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/PackageListItem.java @@ -16,14 +16,14 @@ package com.redhat.rhn.frontend.dto;
import com.redhat.rhn.common.localization.LocalizationService;
+import org.apache.commons.lang.builder.ToStringBuilder; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map;
-import org.apache.commons.lang.builder.ToStringBuilder; - /** * PackageListItem * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java b/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java index f1539a3..7e1f1db 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java @@ -14,13 +14,13 @@ */ package com.redhat.rhn.frontend.dto;
-import java.lang.reflect.InvocationTargetException; -import java.util.Calendar; - import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger;
+import java.lang.reflect.InvocationTargetException; +import java.util.Calendar; +
/** * SystemSearchResult diff --git a/java/code/src/com/redhat/rhn/frontend/events/AbstractDatabaseAction.java b/java/code/src/com/redhat/rhn/frontend/events/AbstractDatabaseAction.java index 2333fff..5fabd58 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/AbstractDatabaseAction.java +++ b/java/code/src/com/redhat/rhn/frontend/events/AbstractDatabaseAction.java @@ -14,12 +14,13 @@ */ package com.redhat.rhn.frontend.events;
-import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.common.messaging.EventMessage; import com.redhat.rhn.common.messaging.MessageAction;
+import org.apache.log4j.Logger; +import org.hibernate.HibernateException; + /** * Base action for any action that communicates with the database. This class will * take care of committing the transaction and any cleanup that is necessary. diff --git a/java/code/src/com/redhat/rhn/frontend/events/NewUserEvent.java b/java/code/src/com/redhat/rhn/frontend/events/NewUserEvent.java index 96a4e38..b7281fa 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/NewUserEvent.java +++ b/java/code/src/com/redhat/rhn/frontend/events/NewUserEvent.java @@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.events;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.messaging.EventMessage; import com.redhat.rhn.domain.org.OrgFactory; @@ -80,7 +81,7 @@ public class NewUserEvent extends BaseEvent implements EventMessage { //create url for new user Config c = Config.get(); StringBuffer url = new StringBuffer(); - if (c.isSSLAvailable()) { + if (ConfigDefaults.get().isSSLAvailable()) { url.append("https://"); } else { @@ -92,7 +93,7 @@ public class NewUserEvent extends BaseEvent implements EventMessage { else { url.append(domain); } - if (c.getString("base_port") != null && !c.isSSLAvailable()) { + if (c.getString("base_port") != null && !ConfigDefaults.get().isSSLAvailable()) { url.append(":"); url.append(c.getString("base_port")); } diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmChangeChannelSubscriptionsAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmChangeChannelSubscriptionsAction.java index 766a327..30a9fe4 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/SsmChangeChannelSubscriptionsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmChangeChannelSubscriptionsAction.java @@ -14,13 +14,14 @@ */ package com.redhat.rhn.frontend.events;
-import java.util.List; import com.redhat.rhn.common.messaging.EventMessage; -import com.redhat.rhn.frontend.action.channel.ssm.ChannelActionDAO; import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.manager.ssm.SsmOperationManager; -import com.redhat.rhn.manager.ssm.SsmManager; +import com.redhat.rhn.frontend.action.channel.ssm.ChannelActionDAO; import com.redhat.rhn.manager.rhnset.RhnSetDecl; +import com.redhat.rhn.manager.ssm.SsmManager; +import com.redhat.rhn.manager.ssm.SsmOperationManager; + +import java.util.List;
/** * Handles performing subscription changes for servers in the SSM. diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmChangeChannelSubscriptionsEvent.java b/java/code/src/com/redhat/rhn/frontend/events/SsmChangeChannelSubscriptionsEvent.java index d3e45fd..74574f3 100644 --- a/java/code/src/com/redhat/rhn/frontend/events/SsmChangeChannelSubscriptionsEvent.java +++ b/java/code/src/com/redhat/rhn/frontend/events/SsmChangeChannelSubscriptionsEvent.java @@ -14,11 +14,12 @@ */ package com.redhat.rhn.frontend.events;
-import java.util.List; import com.redhat.rhn.common.messaging.EventMessage; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.channel.ssm.ChannelActionDAO;
+import java.util.List; + /** * Event fired to carry the information necessary to perform subscription changes * for servers in the SSM. diff --git a/java/code/src/com/redhat/rhn/frontend/graphing/GraphGenerator.java b/java/code/src/com/redhat/rhn/frontend/graphing/GraphGenerator.java index 46625af..4bf0a00 100644 --- a/java/code/src/com/redhat/rhn/frontend/graphing/GraphGenerator.java +++ b/java/code/src/com/redhat/rhn/frontend/graphing/GraphGenerator.java @@ -21,10 +21,10 @@ import org.apache.log4j.Logger; import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartUtilities; import org.jfree.chart.JFreeChart; -import org.jfree.data.xy.XYDataset; import org.jfree.data.time.Minute; import org.jfree.data.time.TimeSeries; import org.jfree.data.time.TimeSeriesCollection; +import org.jfree.data.xy.XYDataset;
import java.io.File; import java.io.IOException; diff --git a/java/code/src/com/redhat/rhn/frontend/integration/IntegrationService.java b/java/code/src/com/redhat/rhn/frontend/integration/IntegrationService.java index b56b174..742f509 100644 --- a/java/code/src/com/redhat/rhn/frontend/integration/IntegrationService.java +++ b/java/code/src/com/redhat/rhn/frontend/integration/IntegrationService.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.integration;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.security.SessionSwap; import com.redhat.rhn.manager.kickstart.cobbler.CobblerLoginCommand;
@@ -91,9 +92,9 @@ public class IntegrationService {
//Handle the taskomatic case (Where we can't rely on the tokenStore since it's // a completely different VM) - if (login.equals(Config.get().getString(Config.COBBLER_AUTOMATED_USER))) { + if (login.equals(Config.get().getString(ConfigDefaults.COBBLER_AUTOMATED_USER))) {
- passwd = Config.get().getString(Config.WEB_SESSION_SECRET_1); + passwd = Config.get().getString(ConfigDefaults.WEB_SESSION_SECRET_1); } else { String md5random = SessionSwap.computeMD5Hash( @@ -138,10 +139,10 @@ public class IntegrationService { */ public boolean checkRandomToken(String login, String encodedRandom) {
- if (login.equals(Config.get().getString(Config.COBBLER_AUTOMATED_USER))) { + if (login.equals(Config.get().getString(ConfigDefaults.COBBLER_AUTOMATED_USER))) { log.debug("checkRandomToken called with taskomatic user!"); return encodedRandom.equals( - Config.get().getString(Config.WEB_SESSION_SECRET_1)); + Config.get().getString(ConfigDefaults.WEB_SESSION_SECRET_1)); }
log.debug("checkRandomToken called with username: " + login); diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/EnvironmentFilter.java b/java/code/src/com/redhat/rhn/frontend/servlets/EnvironmentFilter.java index 302e60a..5348ec9 100644 --- a/java/code/src/com/redhat/rhn/frontend/servlets/EnvironmentFilter.java +++ b/java/code/src/com/redhat/rhn/frontend/servlets/EnvironmentFilter.java @@ -14,6 +14,16 @@ */ package com.redhat.rhn.frontend.servlets;
+import com.redhat.rhn.common.conf.ConfigDefaults; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.frontend.struts.StrutsDelegate; + +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.log4j.Logger; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; + import java.io.IOException;
import javax.servlet.Filter; @@ -25,16 +35,6 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringEscapeUtils; -import org.apache.log4j.Logger; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; - -import com.redhat.rhn.common.conf.Config; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.RhnHelper; -import com.redhat.rhn.frontend.struts.StrutsDelegate; - /** * EnvironmentFilter * @version $Rev$ @@ -76,7 +76,7 @@ public class EnvironmentFilter implements Filter { (HttpServletResponse)response, hreq);
- boolean sslAvail = Config.get().isSSLAvailable(); + boolean sslAvail = ConfigDefaults.get().isSSLAvailable();
// There are a list of pages that don't require SSL, that list should // be called out here. diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/HelpDocServlet.java b/java/code/src/com/redhat/rhn/frontend/servlets/HelpDocServlet.java index 684be06..d116178 100644 --- a/java/code/src/com/redhat/rhn/frontend/servlets/HelpDocServlet.java +++ b/java/code/src/com/redhat/rhn/frontend/servlets/HelpDocServlet.java @@ -14,6 +14,8 @@ */ package com.redhat.rhn.frontend.servlets;
+import com.redhat.rhn.common.conf.Config; + import java.io.IOException;
import javax.servlet.ServletException; @@ -21,8 +23,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse;
-import com.redhat.rhn.common.conf.Config; - /** * HelpDocServlet is a basic servlet that takes a request URI for documentation and * redirects it to the appropriate URI defined in the rhn.conf for that document. diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/PxtCookieManager.java b/java/code/src/com/redhat/rhn/frontend/servlets/PxtCookieManager.java index 6815565..9bcf988 100644 --- a/java/code/src/com/redhat/rhn/frontend/servlets/PxtCookieManager.java +++ b/java/code/src/com/redhat/rhn/frontend/servlets/PxtCookieManager.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.servlets;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.manager.session.SessionManager;
import org.apache.commons.lang.StringUtils; @@ -71,7 +72,7 @@ public class PxtCookieManager { // pxtCookie.setDomain(request.getServerName()); pxtCookie.setMaxAge(timeout); pxtCookie.setPath(DEFAULT_PATH); - pxtCookie.setSecure(Config.get().isSSLAvailable()); + pxtCookie.setSecure(ConfigDefaults.get().isSSLAvailable());
return pxtCookie; } @@ -112,7 +113,7 @@ public class PxtCookieManager { */ protected String getCookieName(HttpServletRequest request) { Config c = Config.get(); - int personality = c.getInt(Config.WEB_ALLOW_PXT_PERSONALITIES); + int personality = c.getInt(ConfigDefaults.WEB_ALLOW_PXT_PERSONALITIES);
if (personality > 0) { String[] name = StringUtils.split(request.getServerName(), '.'); diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/RhnHttpServletRequest.java b/java/code/src/com/redhat/rhn/frontend/servlets/RhnHttpServletRequest.java index f554271..258bd67 100644 --- a/java/code/src/com/redhat/rhn/frontend/servlets/RhnHttpServletRequest.java +++ b/java/code/src/com/redhat/rhn/frontend/servlets/RhnHttpServletRequest.java @@ -14,6 +14,10 @@ */ package com.redhat.rhn.frontend.servlets;
+import com.redhat.rhn.frontend.context.Context; + +import org.apache.commons.lang.builder.ReflectionToStringBuilder; + import java.net.MalformedURLException; import java.net.URL; import java.util.Enumeration; @@ -24,10 +28,6 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper;
-import org.apache.commons.lang.builder.ReflectionToStringBuilder; - -import com.redhat.rhn.frontend.context.Context; - /** * RhnHttpServletRequest * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/test/EnvironmentFilterTest.java b/java/code/src/com/redhat/rhn/frontend/servlets/test/EnvironmentFilterTest.java index 574c16a..c520581 100644 --- a/java/code/src/com/redhat/rhn/frontend/servlets/test/EnvironmentFilterTest.java +++ b/java/code/src/com/redhat/rhn/frontend/servlets/test/EnvironmentFilterTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.servlets.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.frontend.servlets.EnvironmentFilter;
import org.apache.struts.Globals; @@ -40,14 +41,14 @@ public class EnvironmentFilterTest extends BaseFilterTst { filter.init(null);
Config c = Config.get(); - Boolean origValue = new Boolean(c.isSSLAvailable()); - c.setBoolean(Config.SSL_AVAILABLE, Boolean.TRUE.toString()); + Boolean origValue = new Boolean(ConfigDefaults.get().isSSLAvailable()); + c.setBoolean(ConfigDefaults.SSL_AVAILABLE, Boolean.TRUE.toString()); try { filter.doFilter(request, response, chain); } finally { // Revert back - c.setBoolean(Config.SSL_AVAILABLE, origValue.toString()); + c.setBoolean(ConfigDefaults.SSL_AVAILABLE, origValue.toString()); } // Check that we got the expected redirect. String expectedRedir = "https://mymachine.rhndev.redhat.com/rhn/Login.do"; @@ -71,19 +72,19 @@ public class EnvironmentFilterTest extends BaseFilterTst {
public void testAddAMessage() throws Exception { Config c = Config.get(); - boolean origValue = c.isSSLAvailable(); + boolean origValue = ConfigDefaults.get().isSSLAvailable(); EnvironmentFilter filter = new EnvironmentFilter(); filter.init(null); request.setupAddParameter("message", "some.key.to.localize"); request.setupAddParameter("messagep1", "param value"); request.setupAddParameter("messagep2", "param value"); request.setupAddParameter("messagep3", "param value"); - c.setBoolean(Config.SSL_AVAILABLE, Boolean.FALSE.toString()); + c.setBoolean(ConfigDefaults.SSL_AVAILABLE, Boolean.FALSE.toString()); try { filter.doFilter(request, response, chain); } finally { - c.setBoolean(Config.SSL_AVAILABLE, String.valueOf(origValue)); + c.setBoolean(ConfigDefaults.SSL_AVAILABLE, String.valueOf(origValue)); }
assertNotNull(request.getAttribute(Globals.MESSAGE_KEY)); diff --git a/java/code/src/com/redhat/rhn/frontend/servlets/test/PxtCookieManagerTest.java b/java/code/src/com/redhat/rhn/frontend/servlets/test/PxtCookieManagerTest.java index 17fb8f3..e497532 100644 --- a/java/code/src/com/redhat/rhn/frontend/servlets/test/PxtCookieManagerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/servlets/test/PxtCookieManagerTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.servlets.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.frontend.servlets.PxtCookieManager; import com.redhat.rhn.manager.session.SessionManager;
@@ -64,7 +65,7 @@ public class PxtCookieManagerTest extends MockObjectTestCase {
manager = new PxtCookieManager();
- pxtPersonalities = Config.get().getInt(Config.WEB_ALLOW_PXT_PERSONALITIES); + pxtPersonalities = Config.get().getInt(ConfigDefaults.WEB_ALLOW_PXT_PERSONALITIES);
pxtSessionId = new Long(2658447890L);
@@ -77,7 +78,7 @@ public class PxtCookieManagerTest extends MockObjectTestCase { }
protected void tearDown() throws Exception { - Config.get().setString(Config.WEB_ALLOW_PXT_PERSONALITIES, + Config.get().setString(ConfigDefaults.WEB_ALLOW_PXT_PERSONALITIES, Integer.toString(pxtPersonalities));
super.tearDown(); @@ -101,7 +102,7 @@ public class PxtCookieManagerTest extends MockObjectTestCase { }
public final void testGetPxtCookieWhenPxtCookieIsPresentWithPxtPersonalities() { - Config.get().setString(Config.WEB_ALLOW_PXT_PERSONALITIES, "1"); + Config.get().setString(ConfigDefaults.WEB_ALLOW_PXT_PERSONALITIES, "1");
Cookie[] cookies = new Cookie[] { new Cookie("cookie-1", "one"), @@ -116,7 +117,7 @@ public class PxtCookieManagerTest extends MockObjectTestCase { }
public final void testGetPxtCookieWhenPxtCookieIsPresentWithoutPxtPersonalities() { - Config.get().setString(Config.WEB_ALLOW_PXT_PERSONALITIES, "0"); + Config.get().setString(ConfigDefaults.WEB_ALLOW_PXT_PERSONALITIES, "0");
Cookie[] cookies = new Cookie[] { new Cookie("cookie-1", "one"), @@ -131,7 +132,7 @@ public class PxtCookieManagerTest extends MockObjectTestCase { }
public final void testCreatePxtCookieSetNameWithPxtPersonalities() { - Config.get().setString(Config.WEB_ALLOW_PXT_PERSONALITIES, "1"); + Config.get().setString(ConfigDefaults.WEB_ALLOW_PXT_PERSONALITIES, "1");
Cookie pxtCookie = manager.createPxtCookie(pxtSessionId, getRequest(), TIMEOUT);
@@ -140,7 +141,7 @@ public class PxtCookieManagerTest extends MockObjectTestCase { }
public final void testCreatePxtCookieSetsNameWithoutPxtPersonalities() { - Config.get().setString(Config.WEB_ALLOW_PXT_PERSONALITIES, "0"); + Config.get().setString(ConfigDefaults.WEB_ALLOW_PXT_PERSONALITIES, "0");
Cookie pxtCookie = manager.createPxtCookie(pxtSessionId, getRequest(), TIMEOUT);
@@ -173,7 +174,7 @@ public class PxtCookieManagerTest extends MockObjectTestCase { }
public final void testCreatePxtCookieSetsSecure() { - boolean expected = Config.get().isSSLAvailable(); + boolean expected = ConfigDefaults.get().isSSLAvailable();
Cookie pxtCookie = manager.createPxtCookie(pxtSessionId, getRequest(), TIMEOUT);
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 56985ed..61afb42 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/BaseSetHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/BaseSetHelper.java @@ -17,8 +17,8 @@ package com.redhat.rhn.frontend.struts; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.util.MethodUtil; import com.redhat.rhn.domain.Identifiable; -import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.rhnset.RhnSet; +import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.context.Context; import com.redhat.rhn.frontend.taglibs.ListDisplayTag; import com.redhat.rhn.frontend.taglibs.list.ListFilter; 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 733759a..1be782b 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RequestContext.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.struts;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.kickstart.KickstartData; @@ -492,7 +493,7 @@ public class RequestContext { // TODO Write unit tests for getWebSessionCookieName() public String getWebSessionCookieName() { Config c = Config.get(); - int personality = c.getInt(Config.WEB_ALLOW_PXT_PERSONALITIES); + int personality = c.getInt(ConfigDefaults.WEB_ALLOW_PXT_PERSONALITIES); if (personality > 0) { String[] name = StringUtils.split(request.getServerName(), '.');
@@ -524,7 +525,7 @@ public class RequestContext { cookie.setDomain(request.getServerName()); cookie.setPath("/"); cookie.setMaxAge(timeout); - cookie.setSecure(Config.get().isSSLAvailable()); + cookie.setSecure(ConfigDefaults.get().isSSLAvailable());
return cookie; } diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnHelper.java b/java/code/src/com/redhat/rhn/frontend/struts/RhnHelper.java index 7fff556..28a2b01 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnHelper.java @@ -15,13 +15,13 @@
package com.redhat.rhn.frontend.struts;
-import javax.servlet.http.HttpServletRequest; - import org.apache.commons.lang.StringUtils; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.action.DynaActionForm;
+import javax.servlet.http.HttpServletRequest; +
/** * RhnHelper contains helpful methods usable by our presentation layers. 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 d216acb..2b7c367 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnRequestProcessor.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnRequestProcessor.java @@ -15,22 +15,22 @@
package com.redhat.rhn.frontend.struts;
-import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.RequestProcessor; - import com.redhat.rhn.common.messaging.MessageQueue; import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.events.TraceBackEvent; import com.redhat.rhn.manager.acl.AclManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.RequestProcessor; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * RhnRequestProcessor a custom Struts RequestProcessor that * intercepts all of our code struts requests diff --git a/java/code/src/com/redhat/rhn/frontend/struts/RhnValidationHelper.java b/java/code/src/com/redhat/rhn/frontend/struts/RhnValidationHelper.java index a2a9b0a..d1807ab 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/RhnValidationHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/RhnValidationHelper.java @@ -15,15 +15,6 @@
package com.redhat.rhn.frontend.struts;
-import java.net.URL; - -import java.util.List; - -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; - -import javax.servlet.http.HttpServletRequest; - import com.redhat.rhn.common.validator.Validator; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorException; @@ -37,6 +28,13 @@ import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.action.DynaActionForm;
+import java.net.URL; +import java.util.List; + +import javax.mail.internet.AddressException; +import javax.mail.internet.InternetAddress; +import javax.servlet.http.HttpServletRequest; + /** * RhnValidationHelper contains helpful to be used by Struts actions to interact * with the ValidationService diff --git a/java/code/src/com/redhat/rhn/frontend/struts/ScrubbingDynaActionForm.java b/java/code/src/com/redhat/rhn/frontend/struts/ScrubbingDynaActionForm.java index 3d145ea..90a60ae 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/ScrubbingDynaActionForm.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/ScrubbingDynaActionForm.java @@ -14,14 +14,14 @@ */ package com.redhat.rhn.frontend.struts;
+import org.apache.struts.action.DynaActionForm; + import java.util.Collection; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map;
-import org.apache.struts.action.DynaActionForm; - /** * A DynaActionForm which knows how to scrub its input for malicious content. * @version $Rev $ 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 e77f6e2..77ed5b0 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 @@ -14,13 +14,6 @@ */ package com.redhat.rhn.frontend.struts.test;
-import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.common.BadParameterException; import com.redhat.rhn.frontend.listview.ListControl; @@ -30,6 +23,13 @@ import com.redhat.rhn.frontend.struts.StrutsDelegate; import com.redhat.rhn.testing.ActionHelper; import com.redhat.rhn.testing.RhnBaseTestCase;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * RhnUnpagedListActionTest * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/struts/wizard/RhnWizardAction.java b/java/code/src/com/redhat/rhn/frontend/struts/wizard/RhnWizardAction.java index 0d83fc4..a8eb6b6 100644 --- a/java/code/src/com/redhat/rhn/frontend/struts/wizard/RhnWizardAction.java +++ b/java/code/src/com/redhat/rhn/frontend/struts/wizard/RhnWizardAction.java @@ -14,11 +14,10 @@ */ package com.redhat.rhn.frontend.struts.wizard;
-import org.apache.log4j.Logger; - import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction;
+import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java index 5a6d03e..fda78e3 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java @@ -15,6 +15,23 @@
package com.redhat.rhn.frontend.taglibs;
+import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.util.CSVWriter; +import com.redhat.rhn.common.util.DynamicComparator; +import com.redhat.rhn.common.util.ExportWriter; +import com.redhat.rhn.common.util.ServletExportHandler; +import com.redhat.rhn.common.util.StringUtil; +import com.redhat.rhn.domain.rhnset.RhnSet; +import com.redhat.rhn.frontend.dto.UserOverview; +import com.redhat.rhn.frontend.html.HtmlTag; +import com.redhat.rhn.frontend.listview.AlphaBar; +import com.redhat.rhn.frontend.listview.PaginationUtil; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.manager.acl.AclManager; + +import org.apache.commons.lang.StringUtils; + import java.io.IOException; import java.io.StringWriter; import java.util.Arrays; @@ -33,23 +50,6 @@ import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.tagext.BodyContent; import javax.servlet.jsp.tagext.BodyTagSupport;
-import org.apache.commons.lang.StringUtils; - -import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.util.CSVWriter; -import com.redhat.rhn.common.util.DynamicComparator; -import com.redhat.rhn.common.util.ExportWriter; -import com.redhat.rhn.common.util.ServletExportHandler; -import com.redhat.rhn.common.util.StringUtil; -import com.redhat.rhn.domain.rhnset.RhnSet; -import com.redhat.rhn.frontend.dto.UserOverview; -import com.redhat.rhn.frontend.html.HtmlTag; -import com.redhat.rhn.frontend.listview.AlphaBar; -import com.redhat.rhn.frontend.listview.PaginationUtil; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.manager.acl.AclManager; - /** * The ListDisplayTag defines the structure of the ListView. This tag iterates * through the {@link com.redhat.rhn.common.db.datasource.DataResult DataResult} diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/SystemTimeMessageTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/SystemTimeMessageTag.java index 0edca68..498455d 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/SystemTimeMessageTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/SystemTimeMessageTag.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.taglibs;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.domain.server.Server; @@ -75,7 +76,7 @@ public class SystemTimeMessageTag extends TagSupport { long checkInAgo = now.getTime() - lastCheckIn.getTime(); Long days = new Long((((checkInAgo / 1000) / 60) / 60) / 24); boolean awol = days.intValue() > - Config.get().getInt(Config.SYSTEM_CHECKIN_THRESHOLD); + Config.get().getInt(ConfigDefaults.SYSTEM_CHECKIN_THRESHOLD);
retval.append("<table border="0" cellspacing="0" cellpadding="6">");
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java index 211f363..f61cf6f 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java @@ -15,6 +15,14 @@
package com.redhat.rhn.frontend.taglibs.list;
+import com.redhat.rhn.common.util.DynamicComparator; +import com.redhat.rhn.common.util.MethodUtil; +import com.redhat.rhn.common.util.StringUtil; +import com.redhat.rhn.frontend.html.HtmlTag; +import com.redhat.rhn.frontend.struts.RequestContext; + +import org.apache.commons.lang.StringUtils; + import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -28,14 +36,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext;
-import org.apache.commons.lang.StringUtils; - -import com.redhat.rhn.common.util.DynamicComparator; -import com.redhat.rhn.common.util.MethodUtil; -import com.redhat.rhn.common.util.StringUtil; -import com.redhat.rhn.frontend.html.HtmlTag; -import com.redhat.rhn.frontend.struts.RequestContext; - /** * Provides a bunch of helper methods to make working with lists easier from a * custom tag POV. 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 46c83d5..afd9f35 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 @@ -15,6 +15,13 @@
package com.redhat.rhn.frontend.taglibs.list;
+import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.util.StringUtil; +import com.redhat.rhn.frontend.struts.RequestContext; + +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.lang.StringUtils; + import java.io.IOException; import java.io.Writer; import java.util.Enumeration; @@ -33,13 +40,6 @@ import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyTagSupport; import javax.servlet.jsp.tagext.Tag;
-import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.lang.StringUtils; - -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.util.StringUtil; -import com.redhat.rhn.frontend.struts.RequestContext; - /** * Provides various utility functions for the ListTag, ColumnTag, and SpanTag * diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/AddToSsmDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/AddToSsmDecorator.java index 95cb778..700c75f 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/AddToSsmDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/AddToSsmDecorator.java @@ -14,11 +14,12 @@ */ package com.redhat.rhn.frontend.taglibs.list.decorators;
-import javax.servlet.jsp.JspException; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.frontend.html.HtmlTag; -import com.redhat.rhn.frontend.taglibs.list.ListTagUtil; import com.redhat.rhn.frontend.taglibs.ListDisplayTag; +import com.redhat.rhn.frontend.taglibs.list.ListTagUtil; + +import javax.servlet.jsp.JspException;
/** * Decorator to tie into ListTag 3.0 to provide an easy means to add te selected servers diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java index 0eee4c4..9b9e21f 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/PageSizeDecorator.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.frontend.taglibs.list.decorators;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.frontend.html.HtmlTag; import com.redhat.rhn.frontend.taglibs.list.ListTagUtil; @@ -148,7 +148,7 @@ public class PageSizeDecorator extends BaseListDecorator { * @return the defaut page size. */ public static int getDefaultPageSize() { - String sizeStr = Config.get().getDefaultPageSize(); + String sizeStr = ConfigDefaults.get().getDefaultPageSize(); int size = DEFAULT_PAGE_SIZE; try { if (!StringUtils.isBlank(sizeStr)) { @@ -157,7 +157,7 @@ public class PageSizeDecorator extends BaseListDecorator { } catch (NumberFormatException nfe) { logger.warn("Number format exception encountered while parsing " + - Config.DEFAULT_PAGE_SIZE + "=" + sizeStr); + ConfigDefaults.DEFAULT_PAGE_SIZE + "=" + sizeStr); size = DEFAULT_PAGE_SIZE; }
@@ -189,7 +189,7 @@ public class PageSizeDecorator extends BaseListDecorator { * @return the list of page sizes.. */ public static List<Integer> getPageSizes() { - String pageSizes = Config.get().getPageSizes(); + String pageSizes = ConfigDefaults.get().getPageSizes(); String [] sizes = pageSizes.split("\,"); if (StringUtils.isBlank(pageSizes) || sizes == null || sizes.length == 0) { return PAGE_SIZE; @@ -204,7 +204,7 @@ public class PageSizeDecorator extends BaseListDecorator { } catch (NumberFormatException nfe) { logger.warn("Number format exception encountered while parsing " + - Config.PAGE_SIZES + "=" + pageSizes); + ConfigDefaults.PAGE_SIZES + "=" + pageSizes); return Collections.EMPTY_LIST; } } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/test/PageSizeDecoratorTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/test/PageSizeDecoratorTest.java index 22bea3a..41e5ad7 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/test/PageSizeDecoratorTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/test/PageSizeDecoratorTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.taglibs.list.decorators.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator; import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -43,13 +44,13 @@ public class PageSizeDecoratorTest extends RhnBaseTestCase { custom.add(88); custom.add(99); custom.add(300); - Config.get().setString(Config.PAGE_SIZES, + Config.get().setString(ConfigDefaults.PAGE_SIZES, StringUtils.join(custom.iterator(), ", ")); assertEquals(custom, PageSizeDecorator.getPageSizes());
assertTrue(custom.contains(PageSizeDecorator.getDefaultPageSize()));
- Config.get().setString(Config.DEFAULT_PAGE_SIZE, + Config.get().setString(ConfigDefaults.DEFAULT_PAGE_SIZE, String.valueOf(custom.get(4) - 5)); assertTrue(custom.contains(PageSizeDecorator.getDefaultPageSize())); assertEquals((Integer)custom.get(3), 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 abb7e45..227bc2e 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 @@ -14,19 +14,22 @@ */ package com.redhat.rhn.frontend.taglibs.list.helper;
+import com.redhat.rhn.domain.rhnset.RhnSet; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnListSetHelper; +import com.redhat.rhn.manager.rhnset.RhnSetDecl; +import com.redhat.rhn.manager.rhnset.RhnSetManager; + +import org.apache.commons.collections.CollectionUtils; + import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; + import javax.servlet.http.HttpServletRequest; -import org.apache.commons.collections.CollectionUtils; -import com.redhat.rhn.domain.rhnset.RhnSet; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.RhnListSetHelper; -import com.redhat.rhn.manager.rhnset.RhnSetDecl; -import com.redhat.rhn.manager.rhnset.RhnSetManager;
/** * Used in creating rhnSet backed actions that tie into the "new" list tag (i.e. in the diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSessionSetHelper.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSessionSetHelper.java index 0eeff83..1978efc 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSessionSetHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/ListSessionSetHelper.java @@ -15,17 +15,20 @@
package com.redhat.rhn.frontend.taglibs.list.helper;
+import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.SessionSetHelper; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; + import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; + import javax.servlet.http.HttpServletRequest; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.SessionSetHelper;
/** diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/Listable.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/Listable.java index 31d122a..eb3beb5 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/Listable.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/helper/Listable.java @@ -15,9 +15,10 @@
package com.redhat.rhn.frontend.taglibs.list.helper;
-import java.util.List; import com.redhat.rhn.frontend.struts.RequestContext;
+import java.util.List; + /** * Interface used to tie an action into ListTag 3.0 (known for a while as "new List Tag"). * This interface allows the List*Helper classes to interact with the action to retrieve diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/BaseHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/BaseHandler.java index 2b55ec2..a84fee3 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/BaseHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/BaseHandler.java @@ -28,6 +28,8 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.session.SessionManager;
+import org.apache.log4j.Logger; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; @@ -37,8 +39,6 @@ import java.util.List; import java.util.Map; import java.util.Set;
-import org.apache.log4j.Logger; - import redstone.xmlrpc.XmlRpcFault; import redstone.xmlrpc.XmlRpcInvocationHandler;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java index 484cc0c..1db7c53 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/activationkey/ActivationKeyHandler.java @@ -14,20 +14,6 @@ */ package com.redhat.rhn.frontend.xmlrpc.activationkey;
-import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.hibernate.NonUniqueObjectException; - import com.redhat.rhn.FaultException; import com.redhat.rhn.common.hibernate.LookupException; import com.redhat.rhn.common.validator.ValidatorError; @@ -60,6 +46,20 @@ import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.system.ServerGroupManager; import com.redhat.rhn.manager.token.ActivationKeyManager;
+import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.hibernate.NonUniqueObjectException; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * ActivationKeyHandler * diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/org/ChannelOrgHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/org/ChannelOrgHandler.java index 210380f..fb9f1ec 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/org/ChannelOrgHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/org/ChannelOrgHandler.java @@ -14,12 +14,6 @@ */ package com.redhat.rhn.frontend.xmlrpc.channel.org;
-import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.redhat.rhn.FaultException; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; @@ -38,6 +32,12 @@ import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.org.OrgManager;
+import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * ChannelOrgHandler * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java index aad400f..6acf771 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java @@ -26,13 +26,13 @@ import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelArch; import com.redhat.rhn.domain.channel.ChannelFactory; -import com.redhat.rhn.domain.channel.NewChannelHelper; import com.redhat.rhn.domain.channel.InvalidChannelRoleException; +import com.redhat.rhn.domain.channel.NewChannelHelper; import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.errata.ErrataFactory; import com.redhat.rhn.domain.org.Org; -import com.redhat.rhn.domain.rhnpackage.PackageFactory; import com.redhat.rhn.domain.rhnpackage.Package; +import com.redhat.rhn.domain.rhnpackage.PackageFactory; import com.redhat.rhn.domain.role.Role; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.Server; diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java index 4ff4f32..df4416e 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java @@ -31,9 +31,9 @@ import com.redhat.rhn.manager.action.ActionManager; import com.redhat.rhn.manager.configuration.ConfigChannelCreationHelper; import com.redhat.rhn.manager.configuration.ConfigurationManager;
+import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import java.util.HashSet; import java.util.Map; import java.util.Set;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java index aae045d..4d7755f 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/test/ErrataHandlerTest.java @@ -14,14 +14,6 @@ */ package com.redhat.rhn.frontend.xmlrpc.errata.test;
-import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.redhat.rhn.FaultException; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.channel.Channel; @@ -45,6 +37,14 @@ import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils;
import org.apache.commons.lang.RandomStringUtils; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set;
public class ErrataHandlerTest extends BaseHandlerTestCase {
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/filepreservation/FilePreservationListHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/filepreservation/FilePreservationListHandler.java index 852ed83..148c85f 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/filepreservation/FilePreservationListHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/filepreservation/FilePreservationListHandler.java @@ -14,19 +14,19 @@ */ package com.redhat.rhn.frontend.xmlrpc.kickstart.filepreservation;
-import java.util.List; - import com.redhat.rhn.FaultException; +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.domain.common.CommonFactory; +import com.redhat.rhn.domain.common.FileList; +import com.redhat.rhn.domain.org.Org; +import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.xmlrpc.BaseHandler; import com.redhat.rhn.frontend.xmlrpc.FileListAlreadyExistsException; import com.redhat.rhn.frontend.xmlrpc.NoSuchUserException; -import com.redhat.rhn.domain.common.FileList; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.domain.org.Org; -import com.redhat.rhn.domain.common.CommonFactory; import com.redhat.rhn.manager.common.CreateFileListCommand; import com.redhat.rhn.manager.kickstart.KickstartLister; -import com.redhat.rhn.common.db.datasource.DataResult; + +import java.util.List;
/** * @xmlrpc.namespace kickstart.filepreservation diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/filepreservation/test/FilePreservationListHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/filepreservation/test/FilePreservationListHandlerTest.java index 32721a8..c7f0a94 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/filepreservation/test/FilePreservationListHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/filepreservation/test/FilePreservationListHandlerTest.java @@ -14,16 +14,16 @@ */ package com.redhat.rhn.frontend.xmlrpc.kickstart.filepreservation.test;
-import java.util.ArrayList; -import java.util.List; - -import com.redhat.rhn.frontend.xmlrpc.kickstart.filepreservation.FilePreservationListHandler; -import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase; -import com.redhat.rhn.frontend.dto.FilePreservationDto; -import com.redhat.rhn.manager.kickstart.KickstartLister; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.common.CommonFactory; import com.redhat.rhn.domain.common.FileList; +import com.redhat.rhn.frontend.dto.FilePreservationDto; +import com.redhat.rhn.frontend.xmlrpc.kickstart.filepreservation.FilePreservationListHandler; +import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase; +import com.redhat.rhn.manager.kickstart.KickstartLister; + +import java.util.ArrayList; +import java.util.List;
/** * Test cases for the {@link FilePreservationListHandler}. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java index b823e53..e107719 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/CryptoKeysHandler.java @@ -14,18 +14,19 @@ */ package com.redhat.rhn.frontend.xmlrpc.kickstart.keys;
-import java.util.List; +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.common.validator.ValidatorError; +import com.redhat.rhn.domain.kickstart.crypto.CryptoKey; +import com.redhat.rhn.domain.org.Org; +import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.xmlrpc.BaseHandler; import com.redhat.rhn.frontend.xmlrpc.NoSuchUserException; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.domain.org.Org; -import com.redhat.rhn.domain.kickstart.crypto.CryptoKey; import com.redhat.rhn.manager.kickstart.KickstartLister; import com.redhat.rhn.manager.kickstart.crypto.CreateCryptoKeyCommand; import com.redhat.rhn.manager.kickstart.crypto.DeleteCryptoKeyCommand; import com.redhat.rhn.manager.kickstart.crypto.EditCryptoKeyCommand; -import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.common.validator.ValidatorError; + +import java.util.List;
/** * @xmlrpc.namespace kickstart.keys diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/test/CryptoKeysHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/test/CryptoKeysHandlerTest.java index e49113e..c0ef67d 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/test/CryptoKeysHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/keys/test/CryptoKeysHandlerTest.java @@ -14,19 +14,21 @@ */ package com.redhat.rhn.frontend.xmlrpc.kickstart.keys.test;
-import java.util.List; +import com.redhat.rhn.common.util.MD5Crypt; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.crypto.CryptoKey; import com.redhat.rhn.domain.kickstart.crypto.test.CryptoTest; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.dto.CryptoKeyDto; import com.redhat.rhn.frontend.xmlrpc.kickstart.keys.CryptoKeysHandler; import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase; import com.redhat.rhn.frontend.xmlrpc.test.XmlRpcTestUtils; -import com.redhat.rhn.frontend.dto.CryptoKeyDto; import com.redhat.rhn.testing.UserTestUtils; -import com.redhat.rhn.common.util.MD5Crypt; + import org.apache.commons.lang.RandomStringUtils;
+import java.util.List; + /** * Test cases for the {@link CryptoKeysHandler}. * diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java index 066c750..df83b8a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java @@ -14,34 +14,28 @@ */ package com.redhat.rhn.frontend.xmlrpc.kickstart.profile;
-import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.Map; -import java.util.SortedSet; -import java.util.Iterator; -import java.util.Arrays; -import java.util.TreeSet; - import com.redhat.rhn.FaultException; -import com.redhat.rhn.common.util.MD5Crypt; -import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.security.PermissionException; +import com.redhat.rhn.common.util.MD5Crypt; +import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.kickstart.KickstartCommand; +import com.redhat.rhn.domain.kickstart.KickstartCommandName; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartDefaults; import com.redhat.rhn.domain.kickstart.KickstartFactory; -import com.redhat.rhn.domain.kickstart.KickstartCommandName; import com.redhat.rhn.domain.kickstart.KickstartIpRange; import com.redhat.rhn.domain.kickstart.KickstartScript; import com.redhat.rhn.domain.kickstart.KickstartableTree; +import com.redhat.rhn.domain.org.Org; +import com.redhat.rhn.domain.rhnpackage.PackageName; +import com.redhat.rhn.domain.role.RoleFactory; +import com.redhat.rhn.domain.token.ActivationKey; import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.frontend.action.kickstart.KickstartIpRangeFilter; +import com.redhat.rhn.frontend.dto.kickstart.KickstartOptionValue; import com.redhat.rhn.frontend.xmlrpc.BaseHandler; import com.redhat.rhn.frontend.xmlrpc.InvalidChannelLabelException; import com.redhat.rhn.frontend.xmlrpc.InvalidKickstartScriptException; @@ -49,21 +43,26 @@ import com.redhat.rhn.frontend.xmlrpc.InvalidScriptTypeException; import com.redhat.rhn.frontend.xmlrpc.IpRangeConflictException; import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException; import com.redhat.rhn.frontend.xmlrpc.ValidationException; +import com.redhat.rhn.frontend.xmlrpc.kickstart.NoSuchKickstartTreeException; +import com.redhat.rhn.frontend.xmlrpc.kickstart.XmlRpcKickstartHelper; +import com.redhat.rhn.frontend.xmlrpc.kickstart.profile.keys.KeysHandler; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.kickstart.IpAddress; import com.redhat.rhn.manager.kickstart.KickstartFormatter; import com.redhat.rhn.manager.kickstart.KickstartIpCommand; import com.redhat.rhn.manager.kickstart.KickstartOptionsCommand; -import com.redhat.rhn.domain.token.ActivationKey; -import com.redhat.rhn.domain.org.Org; -import com.redhat.rhn.domain.rhnpackage.PackageName; -import com.redhat.rhn.domain.role.RoleFactory; -import com.redhat.rhn.frontend.dto.kickstart.KickstartOptionValue; -import com.redhat.rhn.frontend.xmlrpc.kickstart.profile.keys.KeysHandler;
-import com.redhat.rhn.frontend.action.kickstart.KickstartIpRangeFilter; -import com.redhat.rhn.frontend.xmlrpc.kickstart.NoSuchKickstartTreeException; -import com.redhat.rhn.frontend.xmlrpc.kickstart.XmlRpcKickstartHelper; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet;
/** * ProfileHandler diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/keys/test/KeysHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/keys/test/KeysHandlerTest.java index e0120b5..e7c7a6f 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/keys/test/KeysHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/keys/test/KeysHandlerTest.java @@ -15,8 +15,6 @@
package com.redhat.rhn.frontend.xmlrpc.kickstart.profile.keys.test;
-import java.util.List; - import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; @@ -25,6 +23,8 @@ import com.redhat.rhn.frontend.xmlrpc.kickstart.profile.keys.KeysHandler; import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase; import com.redhat.rhn.manager.token.ActivationKeyManager;
+import java.util.List; + /** * Test cases for the KeysHandler. */ diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java index b1967bb..d8fd6ad 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/SoftwareHandler.java @@ -14,9 +14,6 @@ */ package com.redhat.rhn.frontend.xmlrpc.kickstart.profile.software;
-import java.util.ArrayList; -import java.util.List; - import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.domain.kickstart.KickstartData; @@ -29,6 +26,9 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.xmlrpc.BaseHandler; import com.redhat.rhn.frontend.xmlrpc.kickstart.XmlRpcKickstartHelper;
+import java.util.ArrayList; +import java.util.List; + /** * SoftwareHandler * @xmlrpc.namespace kickstart.profile.software diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java index 96df55c..1bcd982 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/software/test/SoftwareHandlerTest.java @@ -14,16 +14,16 @@ */ package com.redhat.rhn.frontend.xmlrpc.kickstart.profile.software.test;
-import java.util.Iterator; -import java.util.List; -import java.util.ArrayList; - import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.domain.rhnpackage.PackageName; import com.redhat.rhn.frontend.xmlrpc.kickstart.profile.software.SoftwareHandler; import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase;
+import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + /** * SoftwareHandlerTest * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java index fecf213..16dae01 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java @@ -15,32 +15,32 @@
package com.redhat.rhn.frontend.xmlrpc.kickstart.profile.system;
-import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.List; -import java.util.ArrayList; - import com.redhat.rhn.FaultException; +import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.common.CommonFactory; import com.redhat.rhn.domain.common.FileList; import com.redhat.rhn.domain.kickstart.KickstartCommand; -import com.redhat.rhn.domain.kickstart.SELinuxMode; -import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.KickstartData; -import com.redhat.rhn.domain.user.User; +import com.redhat.rhn.domain.kickstart.KickstartFactory; +import com.redhat.rhn.domain.kickstart.SELinuxMode; import com.redhat.rhn.domain.org.Org; +import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.xmlrpc.BaseHandler; import com.redhat.rhn.frontend.xmlrpc.FileListNotFoundException; import com.redhat.rhn.frontend.xmlrpc.InvalidLocaleCodeException; import com.redhat.rhn.frontend.xmlrpc.kickstart.XmlRpcKickstartHelper; +import com.redhat.rhn.manager.kickstart.KickstartCryptoKeyCommand; import com.redhat.rhn.manager.kickstart.KickstartEditCommand; import com.redhat.rhn.manager.kickstart.KickstartLocaleCommand; -import com.redhat.rhn.manager.kickstart.SystemDetailsCommand; -import com.redhat.rhn.manager.kickstart.KickstartCryptoKeyCommand; import com.redhat.rhn.manager.kickstart.KickstartPartitionCommand; -import com.redhat.rhn.common.validator.ValidatorError; +import com.redhat.rhn.manager.kickstart.SystemDetailsCommand; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set;
/** * SystemDetailsHandler diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java index 6de3278..aefc7a6 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/OrgHandler.java @@ -14,42 +14,28 @@ */ package com.redhat.rhn.frontend.xmlrpc.org;
-import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - import com.redhat.rhn.FaultException; import com.redhat.rhn.common.db.datasource.DataList; import com.redhat.rhn.common.hibernate.LookupException; - import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorException; import com.redhat.rhn.common.validator.ValidatorResult; - import com.redhat.rhn.domain.channel.ChannelFamily; import com.redhat.rhn.domain.channel.ChannelFamilyFactory; - import com.redhat.rhn.domain.entitlement.Entitlement; - import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; - import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerFactory; - import com.redhat.rhn.domain.user.User; - import com.redhat.rhn.frontend.dto.MultiOrgEntitlementsDto; import com.redhat.rhn.frontend.dto.MultiOrgSystemEntitlementsDto; import com.redhat.rhn.frontend.dto.OrgChannelFamily; import com.redhat.rhn.frontend.dto.OrgDto; import com.redhat.rhn.frontend.dto.OrgEntitlementDto; import com.redhat.rhn.frontend.dto.OrgSoftwareEntitlementDto; - import com.redhat.rhn.frontend.struts.RhnValidationHelper; - import com.redhat.rhn.frontend.xmlrpc.BaseHandler; import com.redhat.rhn.frontend.xmlrpc.InvalidEntitlementException; import com.redhat.rhn.frontend.xmlrpc.MigrationToSameOrgException; @@ -60,11 +46,8 @@ import com.redhat.rhn.frontend.xmlrpc.OrgNotInTrustException; import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException; import com.redhat.rhn.frontend.xmlrpc.SatelliteOrgException; import com.redhat.rhn.frontend.xmlrpc.ValidationException; - import com.redhat.rhn.manager.channel.ChannelManager; - import com.redhat.rhn.manager.entitlement.EntitlementManager; - import com.redhat.rhn.manager.org.CreateOrgCommand; import com.redhat.rhn.manager.org.MigrationManager; import com.redhat.rhn.manager.org.OrgManager; @@ -73,6 +56,11 @@ import com.redhat.rhn.manager.org.UpdateOrgSystemEntitlementsCommand;
import org.apache.log4j.Logger;
+import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + /** * OrgHandler * diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.java index 64786bf..b5fdeea 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.java @@ -14,11 +14,7 @@ */ package com.redhat.rhn.frontend.xmlrpc.org.test;
-import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.channel.ChannelFamily; import com.redhat.rhn.domain.channel.ChannelFamilyFactory; import com.redhat.rhn.domain.org.Org; @@ -51,6 +47,10 @@ import com.redhat.rhn.testing.ServerTestUtils; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils;
+import java.util.LinkedList; +import java.util.List; +import java.util.Map; + public class OrgHandlerTest extends BaseHandlerTestCase {
private OrgHandler handler = new OrgHandler(); @@ -220,7 +220,7 @@ public class OrgHandlerTest extends BaseHandlerTestCase {
public void testListSoftwareEntitlements() throws Exception { // Spacewalk servers have no software entitlements: - if (Config.get().isSpacewalk()) { + if (ConfigDefaults.get().isSpacewalk()) { return; }
@@ -285,7 +285,7 @@ public class OrgHandlerTest extends BaseHandlerTestCase { assertNotNull(ents);
// Spacewalk servers have no software entitlements: - if (Config.get().isSpacewalk()) { + if (ConfigDefaults.get().isSpacewalk()) { return; }
@@ -334,7 +334,7 @@ public class OrgHandlerTest extends BaseHandlerTestCase {
public void testSetSoftwareEntitlements() throws Exception { // Spacewalk servers have no software entitlements: - if (Config.get().isSpacewalk()) { + if (ConfigDefaults.get().isSpacewalk()) { return; }
@@ -380,7 +380,7 @@ public class OrgHandlerTest extends BaseHandlerTestCase {
public void testSetSoftwareEntitlementsNoSuchOrgOrFamily() throws Exception { // Spacewalk servers have no software entitlements: - if (Config.get().isSpacewalk()) { + if (ConfigDefaults.get().isSpacewalk()) { return; }
@@ -432,7 +432,7 @@ public class OrgHandlerTest extends BaseHandlerTestCase {
public void testSetSoftwareEntitlementsDefaultOrg() throws Exception { // Spacewalk servers have no software entitlements: - if (Config.get().isSpacewalk()) { + if (ConfigDefaults.get().isSpacewalk()) { return; }
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java index d43f9aa..c58977a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/OrgTrustHandler.java @@ -14,12 +14,6 @@ */ package com.redhat.rhn.frontend.xmlrpc.org.trusts;
-import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.redhat.rhn.common.db.datasource.DataList; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.org.Org; @@ -35,6 +29,12 @@ import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.org.OrgManager; import com.redhat.rhn.manager.system.SystemManager;
+import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * OrgTrustsHandler * diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/test/OrgTrustHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/test/OrgTrustHandlerTest.java index c79e420..752f566 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/test/OrgTrustHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/trusts/test/OrgTrustHandlerTest.java @@ -14,10 +14,6 @@ */ package com.redhat.rhn.frontend.xmlrpc.org.trusts.test;
-import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.channel.test.ChannelFactoryTest; @@ -39,6 +35,10 @@ import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils;
+import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** * OrgTrustHandlerTest * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java index 74bc35c..f1563ac 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java @@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.xmlrpc.packages;
import com.redhat.rhn.FaultException; import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.rhnpackage.ChangeLogEntry; @@ -587,7 +588,8 @@ public class PackagesHandler extends BaseHandler { public byte[] getPackage(String sessionKey, Integer pid) throws IOException { User loggedInUser = getLoggedInUser(sessionKey); Package pkg = lookupPackage(loggedInUser, pid); - String path = Config.get().getString(Config.MOUNT_POINT) + "/" + pkg.getPath(); + String path = Config.get().getString(ConfigDefaults.MOUNT_POINT) + "/" + + pkg.getPath(); File file = new File(path);
if (file.length() > Integer.MAX_VALUE) { diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java index 5ff9fb1..6a07b74 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/search/PackagesSearchHandler.java @@ -35,9 +35,6 @@ import com.redhat.rhn.manager.token.ActivationKeyManager; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger;
-import redstone.xmlrpc.XmlRpcFault; - - import java.net.MalformedURLException; import java.util.ArrayList; import java.util.Collections; @@ -45,6 +42,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set;
+import redstone.xmlrpc.XmlRpcFault; +
/** * PackagesSearchHandler diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java index 6800ac5..8f36f98 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/ScheduleHandler.java @@ -14,9 +14,6 @@ */ package com.redhat.rhn.frontend.xmlrpc.schedule;
-import java.util.ArrayList; -import java.util.List; - import com.redhat.rhn.FaultException; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.action.Action; @@ -24,6 +21,9 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.xmlrpc.BaseHandler; import com.redhat.rhn.manager.action.ActionManager;
+import java.util.ArrayList; +import java.util.List; + /** * ScheduleHandler * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/test/ScheduleHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/test/ScheduleHandlerTest.java index 6775e04..3a2e225 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/test/ScheduleHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/schedule/test/ScheduleHandlerTest.java @@ -14,9 +14,6 @@ */ package com.redhat.rhn.frontend.xmlrpc.schedule.test;
-import java.util.ArrayList; -import java.util.List; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.action.Action; import com.redhat.rhn.domain.action.ActionFactory; @@ -29,6 +26,9 @@ import com.redhat.rhn.frontend.xmlrpc.schedule.ScheduleHandler; import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase; import com.redhat.rhn.manager.action.ActionManager;
+import java.util.ArrayList; +import java.util.List; + public class ScheduleHandlerTest extends BaseHandlerTestCase {
private ScheduleHandler handler = new ScheduleHandler(); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java index 723ae02..9d5ee45 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeyDtoSerializer.java @@ -14,13 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer;
-import java.io.Writer; +import com.redhat.rhn.frontend.dto.CryptoKeyDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + import java.io.IOException; +import java.io.Writer; + import redstone.xmlrpc.XmlRpcCustomSerializer; -import redstone.xmlrpc.XmlRpcSerializer; import redstone.xmlrpc.XmlRpcException; -import com.redhat.rhn.frontend.dto.CryptoKeyDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; +import redstone.xmlrpc.XmlRpcSerializer;
/** * Serializes instances of {@link com.redhat.rhn.frontend.dto.CryptoKeyDto}. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java index eda27f2..8ce020f 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/CryptoKeySerializer.java @@ -14,13 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer;
-import java.io.Writer; +import com.redhat.rhn.domain.kickstart.crypto.CryptoKey; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + import java.io.IOException; +import java.io.Writer; + import redstone.xmlrpc.XmlRpcCustomSerializer; -import redstone.xmlrpc.XmlRpcSerializer; import redstone.xmlrpc.XmlRpcException; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; -import com.redhat.rhn.domain.kickstart.crypto.CryptoKey; +import redstone.xmlrpc.XmlRpcSerializer;
/** * Serializes instances of diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java index d218715..3cc3ebf 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataSerializer.java @@ -14,15 +14,13 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer;
-import java.io.IOException; -import java.io.Writer; - import com.redhat.rhn.common.localization.LocalizationService; - import com.redhat.rhn.domain.errata.Errata; - import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+import java.io.IOException; +import java.io.Writer; + import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java index 47a2c61..aa9f97d 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/FilePreservationDtoSerializer.java @@ -14,6 +14,9 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer;
+import com.redhat.rhn.frontend.dto.FilePreservationDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + import java.io.IOException; import java.io.Writer;
@@ -21,9 +24,6 @@ import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer;
-import com.redhat.rhn.frontend.dto.FilePreservationDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - /** * FilePreservationDtoSerializer * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java index a23bf4d..66189eb 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartAdvancedOptionsSerializer.java @@ -20,6 +20,7 @@ import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
import java.io.IOException; import java.io.Writer; + import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer; diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java index c8dc757..c8922c4 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDataSerializer.java @@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
- import java.io.IOException; import java.io.Writer;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java index efec48f..3ad90e4 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartDtoSerializer.java @@ -14,6 +14,9 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer;
+import com.redhat.rhn.frontend.dto.kickstart.KickstartDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + import java.io.IOException; import java.io.Writer;
@@ -21,9 +24,6 @@ import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer;
-import com.redhat.rhn.frontend.dto.kickstart.KickstartDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; -
/** * ActivationKeySerializer diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java index 7e9cdd8..d86e4f7 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartOptionValueSerializer.java @@ -14,13 +14,15 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer;
-import java.io.Writer; +import com.redhat.rhn.frontend.dto.kickstart.KickstartOptionValue; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + import java.io.IOException; +import java.io.Writer; + import redstone.xmlrpc.XmlRpcCustomSerializer; -import redstone.xmlrpc.XmlRpcSerializer; import redstone.xmlrpc.XmlRpcException; -import com.redhat.rhn.frontend.dto.kickstart.KickstartOptionValue; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; +import redstone.xmlrpc.XmlRpcSerializer;
/** * Serializer for {@link KickstartOptionValue} objects. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java index 2b03c8e..c9848c3 100755 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/KickstartScriptSerializer.java @@ -14,6 +14,9 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer;
+import com.redhat.rhn.domain.kickstart.KickstartScript; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + import java.io.IOException; import java.io.Writer;
@@ -21,9 +24,6 @@ import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer;
-import com.redhat.rhn.domain.kickstart.KickstartScript; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - /** * * ErrataOverviewSerializer diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java index 649dc63..44d4b9c 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java @@ -14,18 +14,18 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer;
-import java.io.IOException; -import java.io.Writer; +import com.redhat.rhn.domain.server.NetworkInterface; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
import org.apache.commons.lang.StringUtils;
+import java.io.IOException; +import java.io.Writer; + import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer;
-import com.redhat.rhn.domain.server.NetworkInterface; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; -
/** * NetworkInterfaceSerializer diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java index f1889fc..c4c54cf 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/OrgTrustOverviewSerializer.java @@ -14,6 +14,9 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer;
+import com.redhat.rhn.frontend.dto.OrgTrustOverview; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + import java.io.IOException; import java.io.Writer;
@@ -21,9 +24,6 @@ import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer;
-import com.redhat.rhn.frontend.dto.OrgTrustOverview; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; -
/** * OrgSerializer is a custom serializer for the XMLRPC library. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java index 17b4dc3..cfc56f6 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageNevraSerializer.java @@ -14,6 +14,9 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer;
+import com.redhat.rhn.domain.rhnpackage.PackageNevra; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + import java.io.IOException; import java.io.Writer;
@@ -21,9 +24,6 @@ import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer;
-import com.redhat.rhn.domain.rhnpackage.PackageNevra; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; -
/** * ServerSerializer: Converts a Server object for representation as an XMLRPC struct. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java index 80fb0dc..044bc4e 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleActionSerializer.java @@ -14,8 +14,8 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; import com.redhat.rhn.frontend.dto.ScheduledAction; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
import java.io.IOException; import java.io.Writer; diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java index 18deac3..8a128d1 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ScheduleSystemSerializer.java @@ -14,8 +14,8 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer;
-import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; import com.redhat.rhn.frontend.dto.ActionedSystem; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
import java.io.IOException; import java.io.Writer; diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java index 2a17d07..9e70cc1 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSnapshotSerializer.java @@ -14,6 +14,14 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer;
+import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.config.ConfigChannel; +import com.redhat.rhn.domain.server.EntitlementServerGroup; +import com.redhat.rhn.domain.server.ServerGroup; +import com.redhat.rhn.domain.server.ServerSnapshot; +import com.redhat.rhn.domain.server.SnapshotTag; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + import java.io.IOException; import java.io.Writer; import java.util.HashSet; @@ -23,14 +31,6 @@ import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer;
-import com.redhat.rhn.domain.channel.Channel; -import com.redhat.rhn.domain.config.ConfigChannel; -import com.redhat.rhn.domain.server.EntitlementServerGroup; -import com.redhat.rhn.domain.server.ServerGroup; -import com.redhat.rhn.domain.server.ServerSnapshot; -import com.redhat.rhn.domain.server.SnapshotTag; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; -
/** * ServerSerializer: Converts a Server object for representation as an XMLRPC struct. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java index 90c4825..3d3bc29 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/TrustedOrgDtoSerializer.java @@ -14,6 +14,9 @@ */ package com.redhat.rhn.frontend.xmlrpc.serializer;
+import com.redhat.rhn.frontend.dto.TrustedOrgDto; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + import java.io.IOException; import java.io.Writer;
@@ -21,9 +24,6 @@ import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer;
-import com.redhat.rhn.frontend.dto.TrustedOrgDto; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - /** * TrustedOrgDtoSerializer is a custom serializer for the XMLRPC library. * It converts an TrustedOrgDto to an XMLRPC <struct>. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java index bbc1fe9..19060da 100755 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/VirtualSystemOverviewSerializer.java @@ -15,6 +15,9 @@ package com.redhat.rhn.frontend.xmlrpc.serializer;
+import com.redhat.rhn.frontend.dto.VirtualSystemOverview; +import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; + import java.io.IOException; import java.io.Writer;
@@ -22,9 +25,6 @@ import redstone.xmlrpc.XmlRpcCustomSerializer; import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcSerializer;
-import com.redhat.rhn.frontend.dto.VirtualSystemOverview; -import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper; - /** * * VirtualSystemOverviewSerializer diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index ed29fd5..e49b812 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -14,27 +14,10 @@ */ package com.redhat.rhn.frontend.xmlrpc.system;
-import java.net.URI; -import java.net.URISyntaxException; -import java.sql.Blob; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; - import com.redhat.rhn.FaultException; import com.redhat.rhn.common.client.ClientCertificate; import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.common.hibernate.LookupException; @@ -105,12 +88,12 @@ import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException; import com.redhat.rhn.frontend.xmlrpc.ProfileNameTooLongException; import com.redhat.rhn.frontend.xmlrpc.ProfileNameTooShortException; import com.redhat.rhn.frontend.xmlrpc.ProfileNoBaseChannelException; +import com.redhat.rhn.frontend.xmlrpc.RhnXmlRpcServer; import com.redhat.rhn.frontend.xmlrpc.SystemIdInstantiationException; import com.redhat.rhn.frontend.xmlrpc.SystemsNotDeletedException; import com.redhat.rhn.frontend.xmlrpc.UndefinedCustomFieldsException; import com.redhat.rhn.frontend.xmlrpc.UnrecognizedCountryException; import com.redhat.rhn.frontend.xmlrpc.user.XmlRpcUserHelper; -import com.redhat.rhn.frontend.xmlrpc.RhnXmlRpcServer; import com.redhat.rhn.manager.MissingCapabilityException; import com.redhat.rhn.manager.MissingEntitlementException; import com.redhat.rhn.manager.action.ActionManager; @@ -129,6 +112,24 @@ import com.redhat.rhn.manager.system.VirtualizationActionCommand; import com.redhat.rhn.manager.token.ActivationKeyManager; import com.redhat.rhn.manager.user.UserManager;
+import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; + +import java.net.URI; +import java.net.URISyntaxException; +import java.sql.Blob; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * SystemHandler * @version $Rev$ @@ -2131,7 +2132,7 @@ public class SystemHandler extends BaseHandler { */ private boolean isSystemInactive(SystemOverview so) { Long threshold = new Long(Config.get().getInt( - Config.SYSTEM_CHECKIN_THRESHOLD, 1)); + ConfigDefaults.SYSTEM_CHECKIN_THRESHOLD, 1)); if (so.getLastCheckinDaysAgo().compareTo(threshold) == 1) { return true; } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java index cc738de..364dc09 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java @@ -14,15 +14,6 @@ */ package com.redhat.rhn.frontend.xmlrpc.system.config;
-import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.config.ConfigChannel; import com.redhat.rhn.domain.config.ConfigChannelListProcessor; @@ -40,6 +31,15 @@ import com.redhat.rhn.frontend.xmlrpc.system.XmlRpcSystemHelper; import com.redhat.rhn.manager.MissingCapabilityException; import com.redhat.rhn.manager.configuration.ConfigurationManager;
+import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +
/** * ServerConfigChannelHandler diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/custominfo/test/CustomInfoHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/custominfo/test/CustomInfoHandlerTest.java index 5cf62d8..edc357c 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/custominfo/test/CustomInfoHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/custominfo/test/CustomInfoHandlerTest.java @@ -14,14 +14,14 @@ */ package com.redhat.rhn.frontend.xmlrpc.system.custominfo.test;
-import java.util.Iterator; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.frontend.dto.CustomDataKeyOverview; import com.redhat.rhn.frontend.xmlrpc.system.custominfo.CustomInfoHandler; import com.redhat.rhn.frontend.xmlrpc.test.BaseHandlerTestCase; import com.redhat.rhn.manager.system.SystemManager;
+import java.util.Iterator; + /** * CustomInfoHandlerTest * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/provisioning/snapshot/SnapshotHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/provisioning/snapshot/SnapshotHandler.java index 1930d58..2566a65 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/provisioning/snapshot/SnapshotHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/provisioning/snapshot/SnapshotHandler.java @@ -14,12 +14,6 @@ */ package com.redhat.rhn.frontend.xmlrpc.system.provisioning.snapshot;
-import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.redhat.rhn.domain.config.ConfigRevision; import com.redhat.rhn.domain.rhnpackage.PackageNevra; import com.redhat.rhn.domain.server.Server; @@ -32,6 +26,12 @@ import com.redhat.rhn.frontend.xmlrpc.NoSuchSnapshotException; import com.redhat.rhn.frontend.xmlrpc.NoSuchSystemException; import com.redhat.rhn.frontend.xmlrpc.system.XmlRpcSystemHelper;
+import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * SnapshotHandler * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/search/SystemSearchHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/search/SystemSearchHandler.java index b5cd952..092e788 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/search/SystemSearchHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/search/SystemSearchHandler.java @@ -14,22 +14,22 @@ */ package com.redhat.rhn.frontend.xmlrpc.system.search;
+import com.redhat.rhn.FaultException; +import com.redhat.rhn.common.db.datasource.DataResult; +import com.redhat.rhn.frontend.action.systems.SystemSearchHelper; +import com.redhat.rhn.frontend.xmlrpc.BaseHandler; +import com.redhat.rhn.frontend.xmlrpc.SearchServerCommException; +import com.redhat.rhn.frontend.xmlrpc.SearchServerQueryException; + +import org.apache.log4j.Logger; + import java.net.MalformedURLException; import java.util.Collections; import java.util.List;
-import org.apache.log4j.Logger; - import redstone.xmlrpc.XmlRpcException; import redstone.xmlrpc.XmlRpcFault;
-import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.FaultException; -import com.redhat.rhn.frontend.action.systems.SystemSearchHelper; -import com.redhat.rhn.frontend.xmlrpc.BaseHandler; -import com.redhat.rhn.frontend.xmlrpc.SearchServerCommException; -import com.redhat.rhn.frontend.xmlrpc.SearchServerQueryException; - /** * SystemSearchHandler * Provides access to the internal XMLRPC search-server for system searches diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/ServerGroupHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/ServerGroupHandlerTest.java index 6386dd1..94d73f9 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/ServerGroupHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/ServerGroupHandlerTest.java @@ -14,11 +14,6 @@ */ package com.redhat.rhn.frontend.xmlrpc.system.test;
-import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.List; - import com.redhat.rhn.FaultException; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.ManagedServerGroup; @@ -38,6 +33,11 @@ import com.redhat.rhn.testing.ServerTestUtils; import com.redhat.rhn.testing.TestUtils; import com.redhat.rhn.testing.UserTestUtils;
+import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.List; +
/** * ServerGroupHandlerTest diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java index 2cd85ac..a2b3db4 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java @@ -56,6 +56,7 @@ import com.redhat.rhn.domain.server.InstalledPackage; import com.redhat.rhn.domain.server.ManagedServerGroup; import com.redhat.rhn.domain.server.Network; import com.redhat.rhn.domain.server.NetworkInterface; +import com.redhat.rhn.domain.server.Note; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerConstants; import com.redhat.rhn.domain.server.ServerFactory; @@ -63,7 +64,6 @@ import com.redhat.rhn.domain.server.ServerGroup; import com.redhat.rhn.domain.server.ServerHistoryEvent; import com.redhat.rhn.domain.server.VirtualInstance; import com.redhat.rhn.domain.server.VirtualInstanceFactory; -import com.redhat.rhn.domain.server.Note; import com.redhat.rhn.domain.server.test.GuestBuilder; import com.redhat.rhn.domain.server.test.NetworkInterfaceTest; import com.redhat.rhn.domain.server.test.NetworkTest; diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/systemgroup/ServerGroupHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/systemgroup/ServerGroupHandler.java index c19a966..154cf12 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/systemgroup/ServerGroupHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/systemgroup/ServerGroupHandler.java @@ -14,13 +14,9 @@ */ package com.redhat.rhn.frontend.xmlrpc.systemgroup;
-import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - import com.redhat.rhn.FaultException; import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.WrappedSQLException; import com.redhat.rhn.common.hibernate.LookupException; import com.redhat.rhn.domain.role.RoleFactory; @@ -36,6 +32,11 @@ import com.redhat.rhn.frontend.xmlrpc.ServerNotInGroupException; import com.redhat.rhn.frontend.xmlrpc.system.XmlRpcSystemHelper; import com.redhat.rhn.manager.system.ServerGroupManager;
+import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +
/** * ServerGroupHandler @@ -411,7 +412,7 @@ public class ServerGroupHandler extends BaseHandler { User loggedInUser = getLoggedInUser(sessionKey); ServerGroup sg = lookup(systemGroupName, loggedInUser); Long threshold = new Long(Config.get().getInt( - Config.SYSTEM_CHECKIN_THRESHOLD)); + ConfigDefaults.SYSTEM_CHECKIN_THRESHOLD)); return ServerGroupManager.getInstance().listActiveServers(sg, threshold);
} @@ -461,7 +462,7 @@ public class ServerGroupHandler extends BaseHandler { public List<Long> listInactiveSystemsInGroup(String sessionKey, String systemGroupName) { Long threshold = new Long(Config.get().getInt( - Config.SYSTEM_CHECKIN_THRESHOLD)); + ConfigDefaults.SYSTEM_CHECKIN_THRESHOLD)); return listInactiveSystemsInGroup(sessionKey, systemGroupName, threshold.intValue()); } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java index 71fcd0c..bcd365f 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java @@ -14,23 +14,6 @@ */ package com.redhat.rhn.frontend.xmlrpc.user;
-import com.redhat.rhn.frontend.xmlrpc.DeleteUserException; - -import com.redhat.rhn.manager.user.DeleteSatAdminException; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; - import com.redhat.rhn.FaultException; import com.redhat.rhn.common.hibernate.LookupException; import com.redhat.rhn.common.localization.LocalizationService; @@ -48,6 +31,7 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.frontend.action.common.BadParameterException; import com.redhat.rhn.frontend.xmlrpc.BaseHandler; +import com.redhat.rhn.frontend.xmlrpc.DeleteUserException; import com.redhat.rhn.frontend.xmlrpc.InvalidServerGroupException; import com.redhat.rhn.frontend.xmlrpc.LookupServerGroupException; import com.redhat.rhn.frontend.xmlrpc.NoSuchRoleException; @@ -57,9 +41,23 @@ import com.redhat.rhn.frontend.xmlrpc.UserNotUpdatedException; import com.redhat.rhn.manager.SatManager; import com.redhat.rhn.manager.system.ServerGroupManager; import com.redhat.rhn.manager.user.CreateUserCommand; +import com.redhat.rhn.manager.user.DeleteSatAdminException; import com.redhat.rhn.manager.user.UpdateUserCommand; import com.redhat.rhn.manager.user.UserManager;
+import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * UserHandler * Corresponds to User.pm in old perl code. diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java index 78ac5b5..84425c5 100644 --- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java +++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java @@ -70,6 +70,7 @@ import com.redhat.rhn.manager.system.SystemManager; import org.apache.log4j.Logger; import org.cobbler.Profile;
+import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.HashMap; @@ -79,7 +80,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.ArrayList;
/** * ActionManager - the singleton class used to provide Business Operations diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index 83e8d73..c9ebb5d 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.channel;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.CallableMode; import com.redhat.rhn.common.db.datasource.DataList; import com.redhat.rhn.common.db.datasource.DataResult; @@ -840,7 +841,7 @@ public class ChannelManager extends BaseManager { if (proxyFamily == null || proxyFamily.getChannels() == null || proxyFamily.getChannels().isEmpty()) { - if (!Config.get().isSpacewalk()) { + if (!ConfigDefaults.get().isSpacewalk()) { throw new ProxyChannelNotFoundException(); } return null; @@ -857,7 +858,7 @@ public class ChannelManager extends BaseManager { return proxyChan; } } - if (!Config.get().isSpacewalk()) { + if (!ConfigDefaults.get().isSpacewalk()) { throw new ProxyChannelNotFoundException(); }
@@ -1912,7 +1913,7 @@ public class ChannelManager extends BaseManager {
// Search for rhn-kickstart package name: kspackages = ChannelManager.listLatestPackagesEqual(child.getId(), - Config.get().getKickstartPackageName()); + ConfigDefaults.get().getKickstartPackageName()); if (kspackages.size() > 0) { return child; } @@ -2762,9 +2763,10 @@ public class ChannelManager extends BaseManager { * @return last repo build date */ public static String getRepoLastBuild(Channel channel) { - String pathPrefix = Config.get().getString(Config.REPOMD_PATH_PREFIX, + String pathPrefix = Config.get().getString(ConfigDefaults.REPOMD_PATH_PREFIX, "rhn/repodata"); - String mountPoint = Config.get().getString(Config.REPOMD_CACHE_MOUNT_POINT, "/pub"); + String mountPoint = Config.get().getString(ConfigDefaults.REPOMD_CACHE_MOUNT_POINT, + "/pub"); File theFile = new File(mountPoint + File.separator + pathPrefix + File.separator + channel.getLabel() + File.separator + "repomd.xml"); diff --git a/java/code/src/com/redhat/rhn/manager/channel/EusReleaseComparator.java b/java/code/src/com/redhat/rhn/manager/channel/EusReleaseComparator.java index f8517c6..eae2614 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/EusReleaseComparator.java +++ b/java/code/src/com/redhat/rhn/manager/channel/EusReleaseComparator.java @@ -16,13 +16,12 @@ package com.redhat.rhn.manager.channel;
import com.redhat.rhn.common.util.RpmVersionComparator; - import com.redhat.rhn.frontend.dto.EssentialChannelDto;
-import java.util.Comparator; - import org.apache.commons.lang.StringUtils;
+import java.util.Comparator; + /** * EusReleaseComparator * diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java index f5e46f9..9b58c26 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.channel.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.channel.Channel; @@ -571,7 +572,7 @@ public class ChannelManagerTest extends BaseTestCaseWithUser { Channel base = ChannelTestUtils.createTestChannel(user); Channel tools = ChannelTestUtils.createChildChannel(user, base); PackageManagerTest.addKickstartPackageToChannel( - Config.get().getKickstartPackageName(), tools); + ConfigDefaults.get().getKickstartPackageName(), tools);
Channel lookup = ChannelManager.getToolsChannel(base, user); assertEquals(tools.getId(), lookup.getId()); diff --git a/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java b/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java index a78adb9..102e986 100644 --- a/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java +++ b/java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.configuration.file;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.util.StringUtil; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorException; @@ -56,7 +57,7 @@ public abstract class ConfigFileData { public static final String DEFAULT_CONFIG_DELIM_START = "{|"; public static final String DEFAULT_CONFIG_DELIM_END = "|}"; public static final long MAX_FILE_SIZE = Config.get(). - getInt(Config.CONFIG_REVISION_MAX_SIZE); + getInt(ConfigDefaults.CONFIG_REVISION_MAX_SIZE); private static final String DEFAULT_MACRO_START = Config.get(). getString("web.config_delim_start", DEFAULT_CONFIG_DELIM_START); diff --git a/java/code/src/com/redhat/rhn/manager/download/DownloadManager.java b/java/code/src/com/redhat/rhn/manager/download/DownloadManager.java index 5de5a83..8d2dc7c 100644 --- a/java/code/src/com/redhat/rhn/manager/download/DownloadManager.java +++ b/java/code/src/com/redhat/rhn/manager/download/DownloadManager.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.download;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.security.SessionSwap; import com.redhat.rhn.domain.rhnpackage.Package; import com.redhat.rhn.domain.rhnpackage.PackageSource; @@ -56,7 +57,7 @@ public class DownloadManager extends BaseManager {
//If the package is on our list of non-expiring packages, then generate // a non-expiring URL - List packs = Config.get().getList(Config.NON_EXPIRABLE_PACKAGE_URLS); + List packs = Config.get().getList(ConfigDefaults.NON_EXPIRABLE_PACKAGE_URLS); if (packs != null && packs.contains(pack.getPackageName().getName())) { return getNonExpiringDownloadPath(pack.getId(), pack.getFile(), user, DownloadManager.DOWNLOAD_TYPE_PACKAGE); @@ -133,9 +134,10 @@ public class DownloadManager extends BaseManager { private static String getDownloadPath(Long fileId, String filename, User user, String type) { Long time = 0L; - if (Config.get().getInt(Config.DOWNLOAD_URL_LIFETIME) > 0) { + if (Config.get().getInt(ConfigDefaults.DOWNLOAD_URL_LIFETIME) > 0) { Calendar cal = Calendar.getInstance(); - cal.add(Calendar.MINUTE, Config.get().getInt(Config.DOWNLOAD_URL_LIFETIME)); + cal.add(Calendar.MINUTE, Config.get().getInt( + ConfigDefaults.DOWNLOAD_URL_LIFETIME)); time = cal.getTimeInMillis(); }
@@ -184,7 +186,7 @@ public class DownloadManager extends BaseManager { * @return true if available, false otherwise */ public static boolean isFileAvailable(String path) { - String file = Config.get().getString(Config.MOUNT_POINT) + "/" + path; + String file = Config.get().getString(ConfigDefaults.MOUNT_POINT) + "/" + path; return new File(file).exists(); }
diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java index 2f757e0..42aa9e4 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java +++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.errata;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; @@ -1215,7 +1216,8 @@ public class ErrataManager extends BaseManager { boolean flag = false;
try { - XmlRpcClient client = new XmlRpcClient(Config.get().getSearchServerUrl(), true); + XmlRpcClient client = new XmlRpcClient( + ConfigDefaults.get().getSearchServerUrl(), true); List args = new ArrayList(); args.add("errata"); Boolean rc = (Boolean)client.invoke("admin.updateIndex", args); diff --git a/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand.java b/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand.java index 249ebbe..fdff195 100644 --- a/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand.java +++ b/java/code/src/com/redhat/rhn/manager/errata/cache/UpdateErrataCacheCommand.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.errata.cache;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.action.errata.ErrataAction; @@ -60,7 +61,7 @@ public class UpdateErrataCacheCommand { */ public void updateErrataCache(Long orgId) { int threshold = Config.get().getInt( - Config.ERRATA_CACHE_COMPUTE_THRESHOLD); + ConfigDefaults.ERRATA_CACHE_COMPUTE_THRESHOLD);
Org org = OrgFactory.lookupById(orgId);
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCryptoKeyCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCryptoKeyCommand.java index ba98fa1..7cf7e0a 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCryptoKeyCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartCryptoKeyCommand.java @@ -16,8 +16,8 @@ package com.redhat.rhn.manager.kickstart;
import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.crypto.CryptoKey; -import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.org.Org; +import com.redhat.rhn.domain.user.User;
import java.util.Collections; import java.util.Iterator; diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java index f3c6647..051307d 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.kickstart;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.kickstart.KickstartCommand; import com.redhat.rhn.domain.kickstart.KickstartData; @@ -138,7 +139,7 @@ public class KickstartFormatter { "cp -f /tmp/ks-pre.log /mnt/sysimage/root/" + NEWLINE; private static final String RHN_TRACE = "set -x" + NEWLINE; private static final String XMLRPC_HOST = - Config.get().getString(Config.KICKSTART_HOST, "xmlrpc.rhn.redhat.com"); + Config.get().getString(ConfigDefaults.KICKSTART_HOST, "xmlrpc.rhn.redhat.com");
private static final String VIRT_HOST_GRUB_FIX = "sed -i.backup 's/default=[0-9]*/default=0/' /boot/grub/grub.conf" + NEWLINE; diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java index 255769c..574bb0e 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.manager.kickstart;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.util.download.DownloadException; import com.redhat.rhn.common.util.download.DownloadUtils; import com.redhat.rhn.common.validator.ValidatorException; @@ -50,7 +50,7 @@ public class KickstartManager extends BaseManager { String retval = renderKickstart(data); // Search/replacing all instances of cobbler host with host // we pass in, for use with rhn proxy. - retval = retval.replaceAll(Config.get().getCobblerHost(), host); + retval = retval.replaceAll(ConfigDefaults.get().getCobblerHost(), host); return retval; }
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java index 653584e..e7b0659 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartUrlHelper.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.manager.kickstart;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.security.SessionSwap; import com.redhat.rhn.domain.common.CommonFactory; import com.redhat.rhn.domain.common.TinyUrl; @@ -329,7 +329,7 @@ public class KickstartUrlHelper { Profile prof = Profile.lookupById( CobblerXMLRPCHelper.getAutomatedConnection(), data.getCobblerId()); - return "http://" + Config.get().getCobblerHost() + COBBLER_URL_BASE_PATH + + return "http://" + ConfigDefaults.get().getCobblerHost() + COBBLER_URL_BASE_PATH + prof.getName(); }
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java index ac26ab5..c1220a8 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.manager.kickstart;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; @@ -333,7 +333,7 @@ public class ProvisionVirtualInstanceCommand extends KickstartScheduleCommand { * @return the virt path. */ public static String makeDefaultVirtPath(String name) { - File virtPathDir = Config.get().getVirtPath(); + File virtPathDir = ConfigDefaults.get().getVirtPath(); File virtPath = new File(virtPathDir, name.replace(' ', '-')); return virtPath.getAbsolutePath(); } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java index 7793d07..2a8ebc0 100755 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerCommand.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.manager.kickstart.cobbler;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.util.MethodUtil; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.kickstart.KickstartData; @@ -70,7 +70,7 @@ public abstract class CobblerCommand { */ public CobblerCommand() { xmlRpcToken = IntegrationService.get().getAuthToken( - Config.get().getCobblerAutomatedUser()); + ConfigDefaults.get().getCobblerAutomatedUser()); log.debug("Unauthenticated Cobbler call"); // We abstract this fetch of the class so a test class // can override the invoker with a mock xmlrpc invoker. @@ -153,7 +153,7 @@ public abstract class CobblerCommand { return label.replace(' ', '_'); } String format = "%s--%s"; - String kickstartConfigDir = Config.get().getKickstartConfigDir(); + String kickstartConfigDir = ConfigDefaults.get().getKickstartConfigDir(); String fileName = String.format(format, label.replace(' ', '_'), org.getId()); String retval = kickstartConfigDir + fileName + ".cfg"; return retval; diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java index 6f52d29..a592ca8 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.manager.kickstart.cobbler;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; @@ -76,9 +76,9 @@ public class CobblerProfileCreateCommand extends CobblerProfileCommand { prof.setKsMeta(meta); KickstartFactory.saveKickstartData(this.ksData); prof.setVirtBridge(this.ksData.getDefaultVirtBridge()); - prof.setVirtCpus(Config.get().getDefaultVirtCpus()); - prof.setVirtRam(Config.get().getDefaultVirtMemorySize()); - prof.setVirtFileSize(Config.get().getDefaultVirtDiskSize()); + prof.setVirtCpus(ConfigDefaults.get().getDefaultVirtCpus()); + prof.setVirtRam(ConfigDefaults.get().getDefaultVirtMemorySize()); + prof.setVirtFileSize(ConfigDefaults.get().getDefaultVirtDiskSize()); prof.setKickstart(this.ksData.getCobblerFileName()); prof.save();
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerXMLRPCHelper.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerXMLRPCHelper.java index 0a155eb..6c5638f 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerXMLRPCHelper.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerXMLRPCHelper.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.manager.kickstart.cobbler;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.util.MethodUtil; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.integration.IntegrationService; @@ -93,13 +93,13 @@ public class CobblerXMLRPCHelper implements XMLRPCInvoker { IntegrationService.get().getAuthToken(userName); return (CobblerConnection)MethodUtil.getClassFromConfig( CobblerConnection.class.getName(), - Config.get().getCobblerServerUrl(), token); + ConfigDefaults.get().getCobblerServerUrl(), token); }
private static String getCobblerUrl() { CobblerConnection conn = (CobblerConnection)MethodUtil.getClassFromConfig( CobblerConnection.class.getName(), - Config.get().getCobblerServerUrl()); + ConfigDefaults.get().getCobblerServerUrl()); return conn.getUrl(); }
@@ -109,6 +109,6 @@ public class CobblerXMLRPCHelper implements XMLRPCInvoker { * @return the cobbler connection.. */ public static CobblerConnection getAutomatedConnection() { - return getConnection(Config.get().getCobblerAutomatedUser()); + return getConnection(ConfigDefaults.get().getCobblerAutomatedUser()); } } diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java index c701637..011cf43 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.manager.kickstart.test;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.action.ActionFactory; @@ -361,7 +361,7 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase { user, new Date(), "rhn.webdev.redhat.com");
PackageManagerTest.addPackageToSystemAndChannel( - Config.get().getKickstartPackageName(), server, c); + ConfigDefaults.get().getKickstartPackageName(), server, c); // ksdata.getKsdefault().getKstree().setChannel(c);
cmd.setActivationType(activationType); diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardHelperTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardHelperTest.java index 8179a47..fc933fb 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardHelperTest.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartWizardHelperTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.kickstart.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType; import com.redhat.rhn.manager.kickstart.KickstartWizardHelper; import com.redhat.rhn.testing.BaseTestCaseWithUser; @@ -29,9 +30,9 @@ public class KickstartWizardHelperTest extends BaseTestCaseWithUser {
public void testVirtTypes() { KickstartWizardHelper helper = new KickstartWizardHelper(user); - String origConfig = Config.get().getString(Config.PRODUCT_NAME); - Config.get().setString(Config.PRODUCT_NAME, Config.SPACEWALK); - assertTrue(Config.get().isSpacewalk()); + String origConfig = Config.get().getString(ConfigDefaults.PRODUCT_NAME); + Config.get().setString(ConfigDefaults.PRODUCT_NAME, ConfigDefaults.SPACEWALK); + assertTrue(ConfigDefaults.get().isSpacewalk()); List types = helper.getVirtualizationTypes(); assertNotNull(types); boolean found = false; @@ -44,7 +45,7 @@ public class KickstartWizardHelperTest extends BaseTestCaseWithUser { assertTrue(found); found = false;
- Config.get().setString(Config.PRODUCT_NAME, origConfig); + Config.get().setString(ConfigDefaults.PRODUCT_NAME, origConfig); }
} diff --git a/java/code/src/com/redhat/rhn/manager/monitoring/MonitoringManager.java b/java/code/src/com/redhat/rhn/manager/monitoring/MonitoringManager.java index 7c12590..a2bc1b3 100644 --- a/java/code/src/com/redhat/rhn/manager/monitoring/MonitoringManager.java +++ b/java/code/src/com/redhat/rhn/manager/monitoring/MonitoringManager.java @@ -14,69 +14,51 @@ */ package com.redhat.rhn.manager.monitoring;
-import java.sql.Timestamp; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; - import com.redhat.rhn.domain.monitoring.MonitoringConstants; import com.redhat.rhn.domain.monitoring.MonitoringFactory; import com.redhat.rhn.domain.monitoring.Probe; import com.redhat.rhn.domain.monitoring.ServerProbe; import com.redhat.rhn.domain.monitoring.TemplateProbe; - import com.redhat.rhn.domain.monitoring.command.Command; import com.redhat.rhn.domain.monitoring.command.CommandGroup; - import com.redhat.rhn.domain.monitoring.config.ConfigMacro; import com.redhat.rhn.domain.monitoring.config.MonitoringConfigFactory; - import com.redhat.rhn.domain.monitoring.notification.Filter; import com.redhat.rhn.domain.monitoring.notification.NotificationFactory; - import com.redhat.rhn.domain.monitoring.satcluster.SatCluster; import com.redhat.rhn.domain.monitoring.satcluster.SatClusterFactory; - import com.redhat.rhn.domain.monitoring.suite.ProbeSuite; - import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.org.OrgFactory; - import com.redhat.rhn.domain.role.RoleFactory; - import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerConstants; - import com.redhat.rhn.domain.user.User; - import com.redhat.rhn.frontend.dto.SystemOverview; - import com.redhat.rhn.frontend.dto.monitoring.ServerProbeDto; import com.redhat.rhn.frontend.dto.monitoring.TimeSeriesData; - import com.redhat.rhn.frontend.listview.PageControl; - import com.redhat.rhn.manager.BaseManager; - import com.redhat.rhn.manager.satellite.SystemCommandExecutor; - import com.redhat.rhn.manager.system.SystemManager;
import org.apache.commons.lang.StringUtils; - import org.apache.log4j.Logger;
+import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * MonitoringManager * @version $Rev: 51332 $ diff --git a/java/code/src/com/redhat/rhn/manager/monitoring/test/ModifyProbeCommandTest.java b/java/code/src/com/redhat/rhn/manager/monitoring/test/ModifyProbeCommandTest.java index 1cbd08a..3e782c7 100644 --- a/java/code/src/com/redhat/rhn/manager/monitoring/test/ModifyProbeCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/monitoring/test/ModifyProbeCommandTest.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.manager.monitoring.test;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.monitoring.MonitoringConstants; import com.redhat.rhn.domain.monitoring.Probe; import com.redhat.rhn.domain.monitoring.ServerProbe; @@ -44,7 +44,7 @@ public class ModifyProbeCommandTest extends BaseTestCaseWithUser {
public void testCreateForProbeSuite() throws Exception { - if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; } ProbeSuite ps = ProbeSuiteTest.createTestProbeSuite(user); @@ -97,7 +97,7 @@ public class ModifyProbeCommandTest extends BaseTestCaseWithUser { }
public void testCreateServerProbe() throws Exception { - if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; } Command c = MonitoringConstants.getCommandCheckTCP(); @@ -146,7 +146,7 @@ public class ModifyProbeCommandTest extends BaseTestCaseWithUser { * @throws Exception */ public void testCreateEmptyServerProbe() throws Exception { - if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; } Command c = MonitoringConstants.getCommandCheckTCP(); diff --git a/java/code/src/com/redhat/rhn/manager/monitoring/test/MonitoringManagerTest.java b/java/code/src/com/redhat/rhn/manager/monitoring/test/MonitoringManagerTest.java index 2499dfc..cf4e390 100644 --- a/java/code/src/com/redhat/rhn/manager/monitoring/test/MonitoringManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/monitoring/test/MonitoringManagerTest.java @@ -15,7 +15,7 @@
package com.redhat.rhn.manager.monitoring.test;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.WriteMode; @@ -76,7 +76,7 @@ public class MonitoringManagerTest extends RhnBaseTestCase { */ public void setUp() throws Exception { user = UserTestUtils.findNewUser("testUser", "testOrg"); - if (Config.get().isMonitoringBackend()) { + if (ConfigDefaults.get().isMonitoringBackend()) { probe = (ServerProbe) MonitoringFactoryTest.createTestProbe(user); } } @@ -84,7 +84,7 @@ public class MonitoringManagerTest extends RhnBaseTestCase { public void testGetTimeSeriesData() throws Exception {
// If this is in HOSTED, dont run the test - if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; }
@@ -110,7 +110,7 @@ public class MonitoringManagerTest extends RhnBaseTestCase {
public void testGetTimeSeriesList() throws Exception { // If this is in HOSTED, dont run the test - if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; } Timestamp etime = addTimeSeriesDataToProbe(user, probe); @@ -244,7 +244,7 @@ public class MonitoringManagerTest extends RhnBaseTestCase {
public void testStateChange() throws Exception { // If this is in HOSTED, dont run the test - if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; } String dateString1 = "Nov 1, 2000 6:00 PM"; @@ -277,7 +277,7 @@ public class MonitoringManagerTest extends RhnBaseTestCase {
public void testStoreProbe() throws Exception { // If this is in HOSTED, dont run the test - if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; } String changeDesc = probe.getDescription() + TestUtils.randomString(); @@ -291,7 +291,7 @@ public class MonitoringManagerTest extends RhnBaseTestCase {
public void testGetConfigMacros() { // If this is in HOSTED, dont run the test - if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; }
@@ -328,7 +328,7 @@ public class MonitoringManagerTest extends RhnBaseTestCase {
public void testDeleteProbe() throws Exception { // If this is in HOSTED, dont run the test - if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; } Long id = probe.getId(); @@ -352,7 +352,7 @@ public class MonitoringManagerTest extends RhnBaseTestCase {
public void testAddServerToSuite() throws Exception { // If this is in HOSTED, dont run the test - if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; } ProbeSuite suite = ProbeSuiteTest.createTestProbeSuite(user); @@ -368,7 +368,7 @@ public class MonitoringManagerTest extends RhnBaseTestCase {
public void testServersToSuite() throws Exception {
- if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; } ProbeSuite probeSuite = ProbeSuiteTest.createTestProbeSuite(user); @@ -411,7 +411,7 @@ public class MonitoringManagerTest extends RhnBaseTestCase { }
public void testDetachProbes() throws Exception { - if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; } ProbeSuite probeSuite = ProbeSuiteTest.createTestProbeSuite(user); @@ -459,7 +459,7 @@ public class MonitoringManagerTest extends RhnBaseTestCase { }
public void testGetProbeCountsByState() throws Exception { - if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; } for (int i = 0; i < 5; i++) { @@ -472,7 +472,7 @@ public class MonitoringManagerTest extends RhnBaseTestCase { }
public void testGetProbesByState() throws Exception { - if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; } for (int i = 0; i < 5; i++) { @@ -485,12 +485,11 @@ public class MonitoringManagerTest extends RhnBaseTestCase { listProbesByState(user, MonitoringConstants.PROBE_STATE_CRITICAL, null); assertTrue("not enough returned: " + critprobes.size(), critprobes.size() >= 1); ServerProbeDto row = (ServerProbeDto) allprobes.get(0); - System.out.println("\n\n\nStatestring: " + row.getStateString()); assertNotNull(row.getStateString()); }
public void testListProbeStateSummary() throws Exception { - if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; } for (int i = 0; i < 5; i++) { diff --git a/java/code/src/com/redhat/rhn/manager/monitoring/test/ScoutConfigPushCommandTest.java b/java/code/src/com/redhat/rhn/manager/monitoring/test/ScoutConfigPushCommandTest.java index f42b772..5e8319d 100644 --- a/java/code/src/com/redhat/rhn/manager/monitoring/test/ScoutConfigPushCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/monitoring/test/ScoutConfigPushCommandTest.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.manager.monitoring.test;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.manager.monitoring.ScoutConfigPushCommand; import com.redhat.rhn.testing.BaseTestCaseWithUser;
@@ -26,7 +26,7 @@ public class ScoutConfigPushCommandTest extends BaseTestCaseWithUser {
public void testPushConfig() throws Exception { - if (!Config.get().isMonitoringBackend()) { + if (!ConfigDefaults.get().isMonitoringBackend()) { return; } ScoutConfigPushCommand cmd = new ScoutConfigPushCommand(user); diff --git a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java index 146446b..13b3c52 100644 --- a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java +++ b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java @@ -14,11 +14,6 @@ */ package com.redhat.rhn.manager.org;
-import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; - import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.domain.monitoring.MonitoringFactory; import com.redhat.rhn.domain.monitoring.Probe; @@ -45,6 +40,11 @@ import com.redhat.rhn.manager.monitoring.MonitoringManager; import com.redhat.rhn.manager.system.ServerGroupManager; import com.redhat.rhn.manager.system.SystemManager;
+import java.util.ArrayList; +import java.util.Date; +import java.util.LinkedList; +import java.util.List; + /** * MigrationManager * diff --git a/java/code/src/com/redhat/rhn/manager/org/OrgManager.java b/java/code/src/com/redhat/rhn/manager/org/OrgManager.java index 37d45e7..803b48c 100644 --- a/java/code/src/com/redhat/rhn/manager/org/OrgManager.java +++ b/java/code/src/com/redhat/rhn/manager/org/OrgManager.java @@ -14,20 +14,10 @@ */ package com.redhat.rhn.manager.org;
-import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Comparator; - import com.redhat.rhn.common.db.datasource.DataList; +import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; -import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.common.validator.ValidatorException; @@ -47,6 +37,16 @@ import com.redhat.rhn.frontend.dto.TrustedOrgDto; import com.redhat.rhn.manager.BaseManager; import com.redhat.rhn.manager.entitlement.EntitlementManager;
+import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * OrgManager - Manages MultiOrg tasks * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java b/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java index 57f3aec..afcca0b 100644 --- a/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java +++ b/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSoftwareEntitlementsCommand.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.manager.org;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.CallableMode; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.validator.ValidatorError; @@ -79,7 +79,7 @@ public class UpdateOrgSoftwareEntitlementsCommand { orgCur = new Long(0); }
- if (orgCur > this.newTotal && !Config.get().forceUnentitlement()) { + if (orgCur > this.newTotal && !ConfigDefaults.get().forceUnentitlement()) { retval = false; } return retval; diff --git a/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSystemEntitlementsCommand.java b/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSystemEntitlementsCommand.java index 1b5f3b0..b5877df 100644 --- a/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSystemEntitlementsCommand.java +++ b/java/code/src/com/redhat/rhn/manager/org/UpdateOrgSystemEntitlementsCommand.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.manager.org;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.CallableMode; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.localization.LocalizationService; @@ -79,7 +79,7 @@ public class UpdateOrgSystemEntitlementsCommand { orgCur = sg.getCurrentMembers(); }
- if (orgCur > this.newTotal && !Config.get().forceUnentitlement()) { + if (orgCur > this.newTotal && !ConfigDefaults.get().forceUnentitlement()) { retval = false; }
diff --git a/java/code/src/com/redhat/rhn/manager/org/test/MigrationManagerTest.java b/java/code/src/com/redhat/rhn/manager/org/test/MigrationManagerTest.java index a3e1fa9..0d2d1e0 100644 --- a/java/code/src/com/redhat/rhn/manager/org/test/MigrationManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/org/test/MigrationManagerTest.java @@ -14,13 +14,7 @@ */ package com.redhat.rhn.manager.org.test;
-import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import com.redhat.rhn.common.hibernate.HibernateFactory; - import com.redhat.rhn.common.security.PermissionException; import com.redhat.rhn.domain.config.ConfigChannel; import com.redhat.rhn.domain.monitoring.MonitoringConstants; @@ -50,6 +44,11 @@ import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.ServerTestUtils; import com.redhat.rhn.testing.UserTestUtils;
+import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + /** * MigrationManagerTest * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/manager/org/test/OrgManagerTest.java b/java/code/src/com/redhat/rhn/manager/org/test/OrgManagerTest.java index 5f8debe..5b4059d 100644 --- a/java/code/src/com/redhat/rhn/manager/org/test/OrgManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/org/test/OrgManagerTest.java @@ -15,16 +15,11 @@ package com.redhat.rhn.manager.org.test;
import com.redhat.rhn.common.db.datasource.DataList; - import com.redhat.rhn.domain.org.Org; - import com.redhat.rhn.domain.role.RoleFactory; - import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.user.UserFactory; - import com.redhat.rhn.manager.org.OrgManager; - import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.UserTestUtils;
diff --git a/java/code/src/com/redhat/rhn/manager/org/test/UpdateOrgSoftwareEntitlementsTest.java b/java/code/src/com/redhat/rhn/manager/org/test/UpdateOrgSoftwareEntitlementsTest.java index 6ff733b..cd372d2 100644 --- a/java/code/src/com/redhat/rhn/manager/org/test/UpdateOrgSoftwareEntitlementsTest.java +++ b/java/code/src/com/redhat/rhn/manager/org/test/UpdateOrgSoftwareEntitlementsTest.java @@ -14,8 +14,6 @@ */ package com.redhat.rhn.manager.org.test;
-import java.util.Iterator; - import com.redhat.rhn.domain.channel.ChannelFamily; import com.redhat.rhn.domain.channel.PrivateChannelFamily; import com.redhat.rhn.domain.channel.test.ChannelFamilyFactoryTest; @@ -25,6 +23,8 @@ import com.redhat.rhn.manager.org.UpdateOrgSoftwareEntitlementsCommand; import com.redhat.rhn.testing.BaseTestCaseWithUser; import com.redhat.rhn.testing.TestUtils;
+import java.util.Iterator; +
/** * UpdateOrgSystemEntitlements diff --git a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java index c697ec0..a36e185 100644 --- a/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/rhnpackage/test/PackageManagerTest.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.manager.rhnpackage.test;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.WriteMode; @@ -536,7 +536,8 @@ public class PackageManagerTest extends BaseTestCaseWithUser {
public void testPackageNamesByCapabilityAndChannel() throws Exception { Channel channel1 = ChannelFactoryTest.createTestChannel(user); - addKickstartPackageToChannel(Config.get().getKickstartPackageName(), channel1); + addKickstartPackageToChannel( + ConfigDefaults.get().getKickstartPackageName(), channel1);
// Add a regular non-kickstart package as well: PackageManagerTest.addPackageToChannel("Another package", channel1); @@ -546,16 +547,17 @@ public class PackageManagerTest extends BaseTestCaseWithUser { assertNotNull(dr); assertEquals(1, dr.size()); PackageListItem item = (PackageListItem)dr.get(0); - assertEquals(Config.get().getKickstartPackageName(), item.getName()); + assertEquals(ConfigDefaults.get().getKickstartPackageName(), item.getName()); }
// Verify that packages with the given capability in other channels are not visible: public void testPackageNamesByCapabilityAndChannelFiltering() throws Exception { Channel channel1 = ChannelFactoryTest.createTestChannel(user); - addKickstartPackageToChannel(Config.get().getKickstartPackageName(), channel1); + addKickstartPackageToChannel( + ConfigDefaults.get().getKickstartPackageName(), channel1);
Channel channel2 = ChannelFactoryTest.createTestChannel(user); - addKickstartPackageToChannel(Config.get(). + addKickstartPackageToChannel(ConfigDefaults.get(). getKickstartPackageName() + "2", channel2);
DataResult dr = PackageManager.packageNamesByCapabilityAndChannel(user.getOrg(), @@ -564,7 +566,7 @@ public class PackageManagerTest extends BaseTestCaseWithUser {
assertEquals(1, dr.size()); PackageListItem item = (PackageListItem)dr.get(0); - assertEquals(Config.get().getKickstartPackageName(), item.getName()); + assertEquals(ConfigDefaults.get().getKickstartPackageName(), item.getName()); }
public void testPackageNameOverview() { diff --git a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java b/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java index a151135..c46d496 100644 --- a/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java +++ b/java/code/src/com/redhat/rhn/manager/rhnset/RhnSetDecl.java @@ -14,20 +14,19 @@ */ package com.redhat.rhn.manager.rhnset;
-import java.util.HashMap; -import java.util.Map; - import com.redhat.rhn.common.util.Asserts; +import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.SetCleanup; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.SetLabels; import com.redhat.rhn.frontend.action.monitoring.ProbeSuiteHelper;
-import com.redhat.rhn.domain.channel.Channel; - import org.apache.commons.lang.builder.HashCodeBuilder;
+import java.util.HashMap; +import java.util.Map; + /** * The declaration of an {@link RhnSet}. This combines the name of the set with * the security information needed to ensure that users only put items into the diff --git a/java/code/src/com/redhat/rhn/manager/rhnset/test/RhnSetManagerTest.java b/java/code/src/com/redhat/rhn/manager/rhnset/test/RhnSetManagerTest.java index c4469d0..27605c4 100644 --- a/java/code/src/com/redhat/rhn/manager/rhnset/test/RhnSetManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/rhnset/test/RhnSetManagerTest.java @@ -15,8 +15,8 @@ package com.redhat.rhn.manager.rhnset.test;
import com.redhat.rhn.domain.rhnset.RhnSet; -import com.redhat.rhn.domain.rhnset.SetCleanup; import com.redhat.rhn.domain.rhnset.RhnSetElement; +import com.redhat.rhn.domain.rhnset.SetCleanup; import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.UserTestUtils; diff --git a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureCertificateCommand.java b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureCertificateCommand.java index dbd9c12..2357633 100644 --- a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureCertificateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureCertificateCommand.java @@ -14,17 +14,19 @@ */ package com.redhat.rhn.manager.satellite;
+import com.redhat.rhn.common.conf.ConfigDefaults; +import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.common.validator.ValidatorError; +import com.redhat.rhn.domain.user.User; + +import org.apache.commons.lang.RandomStringUtils; + import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.PrintStream; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.RandomStringUtils; -import com.redhat.rhn.common.conf.Config; -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.common.validator.ValidatorError; -import com.redhat.rhn.domain.user.User;
/** * Updates the satellite certificate using the <code>rhn-satellite-activate</code> @@ -71,7 +73,7 @@ public class ConfigureCertificateCommand args.add("/usr/bin/rhn-satellite-activate"); args.add("--rhn-cert"); args.add(getCertificateFileName()); - if (Config.get().isDisconnected()) { + if (ConfigDefaults.get().isDisconnected()) { args.add("--disconnected"); } if (ignoreVersionMismatch) { diff --git a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java index bc89e07..24e54ed 100644 --- a/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java +++ b/java/code/src/com/redhat/rhn/manager/satellite/ConfigureSatelliteCommand.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.satellite;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.monitoring.config.ConfigMacro; @@ -121,40 +122,42 @@ public class ConfigureSatelliteCommand extends BaseConfigureCommand }
Executor e = getExecutor(); - if (keysToBeUpdated.contains(Config.WEB_IS_MONITORING_BACKEND)) { - boolean backend = Config.get().getBoolean(Config.WEB_IS_MONITORING_BACKEND); + if (keysToBeUpdated.contains(ConfigDefaults.WEB_IS_MONITORING_BACKEND)) { + boolean backend = Config.get().getBoolean( + ConfigDefaults.WEB_IS_MONITORING_BACKEND); if (backend) { enableMonitoring(); } } - if (keysToBeUpdated.contains(Config.WEB_IS_MONITORING_SCOUT)) { - boolean scout = Config.get().getBoolean(Config.WEB_IS_MONITORING_SCOUT); + if (keysToBeUpdated.contains(ConfigDefaults.WEB_IS_MONITORING_SCOUT)) { + boolean scout = Config.get().getBoolean(ConfigDefaults.WEB_IS_MONITORING_SCOUT); if (scout) { enableMonitoringScout(); } }
- if (keysToBeUpdated.contains(Config.JABBER_SERVER)) { + if (keysToBeUpdated.contains(ConfigDefaults.JABBER_SERVER)) { updateHostname();
// if hostname changes, we must update // osa-dispatcher.server_jabber as well this.updateString("osa-dispatcher.jabber_server", - Config.get().getHostname()); + ConfigDefaults.get().getHostname()); }
- if (keysToBeUpdated.contains(Config.MOUNT_POINT)) { - this.updateString(Config.KICKSTART_MOUNT_POINT, - Config.get().getString(Config.MOUNT_POINT)); + if (keysToBeUpdated.contains(ConfigDefaults.MOUNT_POINT)) { + this.updateString(ConfigDefaults.KICKSTART_MOUNT_POINT, + Config.get().getString(ConfigDefaults.MOUNT_POINT)); }
- if (keysToBeUpdated.contains(Config.DISCONNECTED) && - !Config.get().getBoolean(Config.DISCONNECTED)) { + if (keysToBeUpdated.contains(ConfigDefaults.DISCONNECTED) && + !Config.get().getBoolean(ConfigDefaults.DISCONNECTED)) { //if there isn't already a value set for the satellite parent (We don't want to // overwrite a custom value.) - if (Config.get().getString(Config.SATELLITE_PARENT) == null || - Config.get().getString(Config.SATELLITE_PARENT).length() == 0) { - this.updateString(Config.SATELLITE_PARENT, Config.DEFAULT_SAT_PARENT); + if (Config.get().getString(ConfigDefaults.SATELLITE_PARENT) == null || + Config.get().getString(ConfigDefaults.SATELLITE_PARENT).length() == 0) { + this.updateString(ConfigDefaults.SATELLITE_PARENT, + ConfigDefaults.DEFAULT_SAT_PARENT); } }
@@ -229,7 +232,8 @@ public class ConfigureSatelliteCommand extends BaseConfigureCommand SatClusterFactory.saveSatNode(node);
// Set the scout shared key so it can be stored out to disk. - Config.get().setString(Config.WEB_SCOUT_SHARED_KEY, node.getScoutSharedKey()); + Config.get().setString(ConfigDefaults.WEB_SCOUT_SHARED_KEY, + node.getScoutSharedKey()); ModifyMethodCommand mmc = new ModifyMethodCommand(getUser()); mmc.setType(NotificationFactory.TYPE_EMAIL); mmc.setEmail(getUser().getEmail()); @@ -285,7 +289,7 @@ public class ConfigureSatelliteCommand extends BaseConfigureCommand setConfigMacroDefault(cmmail, "localhost"); ConfigMacro cmdom = MonitoringConfigFactory. lookupConfigMacroByName("MDOM"); - setConfigMacroDefault(cmdom, Config.get().getHostname()); + setConfigMacroDefault(cmdom, ConfigDefaults.get().getHostname()); ConfigMacro dbname = MonitoringConfigFactory. lookupConfigMacroByName("RHN_DB_NAME"); setConfigMacroDefault(dbname, MonitoringConfigFactory.getDatabaseName()); @@ -300,7 +304,7 @@ public class ConfigureSatelliteCommand extends BaseConfigureCommand setConfigMacroDefault(dbowner, MonitoringConfigFactory.getDatabaseUsername()); ConfigMacro sathostname = MonitoringConfigFactory. lookupConfigMacroByName("RHN_SAT_HOSTNAME"); - setConfigMacroDefault(sathostname, Config.get().getHostname()); + setConfigMacroDefault(sathostname, ConfigDefaults.get().getHostname()); ConfigMacro xproto = MonitoringConfigFactory. lookupConfigMacroByName("XPROTO"); setConfigMacroDefault(xproto, "https"); @@ -336,7 +340,7 @@ public class ConfigureSatelliteCommand extends BaseConfigureCommand private void updateHostname() { ConfigMacro sathostname = MonitoringConfigFactory. lookupConfigMacroByName("RHN_SAT_HOSTNAME"); - setConfigMacro(sathostname, Config.get().getHostname()); + setConfigMacro(sathostname, ConfigDefaults.get().getHostname()); }
/** diff --git a/java/code/src/com/redhat/rhn/manager/satellite/SystemCommandExecutor.java b/java/code/src/com/redhat/rhn/manager/satellite/SystemCommandExecutor.java index 23db13a..d8075ee 100644 --- a/java/code/src/com/redhat/rhn/manager/satellite/SystemCommandExecutor.java +++ b/java/code/src/com/redhat/rhn/manager/satellite/SystemCommandExecutor.java @@ -17,9 +17,9 @@ package com.redhat.rhn.manager.satellite; import org.apache.log4j.Logger;
import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; import java.util.Arrays;
/** diff --git a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java index b31860e..b182a46 100644 --- a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureCertificateCommandTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.satellite.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.manager.satellite.ConfigureCertificateCommand; import com.redhat.rhn.manager.satellite.Executor; @@ -29,9 +30,10 @@ public class ConfigureCertificateCommandTest extends BaseTestCaseWithUser { private ConfigureCertificateCommand cmd;
public void testCreateCommand() throws Exception { - String originalConfig = Config.get().getString(Config.SATELLITE_PARENT); + String originalConfig = Config.get().getString(ConfigDefaults.SATELLITE_PARENT);
- Config.get().setString(Config.SATELLITE_PARENT, "satellite.webqa.redhat.com"); + Config.get().setString(ConfigDefaults.SATELLITE_PARENT, + "satellite.webqa.redhat.com"); user.addRole(RoleFactory.SAT_ADMIN); cmd = new ConfigureCertificateCommand(user) { protected Executor getExecutor() { @@ -46,16 +48,17 @@ public class ConfigureCertificateCommandTest extends BaseTestCaseWithUser { assertNull(cmd.storeConfiguration());
if (originalConfig == null) { - Config.get().setString(Config.SATELLITE_PARENT, ""); + Config.get().setString(ConfigDefaults.SATELLITE_PARENT, ""); } else { - Config.get().setString(Config.SATELLITE_PARENT, originalConfig); + Config.get().setString(ConfigDefaults.SATELLITE_PARENT, originalConfig); } }
public void testCreateCommandIgnoreMismatch() throws Exception { - String originalConfig = Config.get().getString(Config.SATELLITE_PARENT); - Config.get().setString(Config.SATELLITE_PARENT, "satellite.webqa.redhat.com"); + String originalConfig = Config.get().getString(ConfigDefaults.SATELLITE_PARENT); + Config.get().setString(ConfigDefaults.SATELLITE_PARENT, + "satellite.webqa.redhat.com"); user.addRole(RoleFactory.SAT_ADMIN); cmd = new ConfigureCertificateCommand(user) { protected Executor getExecutor() { @@ -73,10 +76,10 @@ public class ConfigureCertificateCommandTest extends BaseTestCaseWithUser { assertNotNull(cmd.getCertificateText()); assertNull(cmd.storeConfiguration()); if (originalConfig == null) { - Config.get().setString(Config.SATELLITE_PARENT, ""); + Config.get().setString(ConfigDefaults.SATELLITE_PARENT, ""); } else { - Config.get().setString(Config.SATELLITE_PARENT, originalConfig); + Config.get().setString(ConfigDefaults.SATELLITE_PARENT, originalConfig); } }
diff --git a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java index 397c573..b90836c 100644 --- a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.satellite.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.domain.monitoring.config.ConfigMacro; import com.redhat.rhn.domain.monitoring.config.DbEnvironment; @@ -109,7 +110,7 @@ public class ConfigureSatelliteCommandTest extends BaseTestCaseWithUser { }
public void testEnableMonitoring() throws Exception { - Config.get().setBoolean(Config.WEB_IS_MONITORING_BACKEND, + Config.get().setBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND, Boolean.FALSE.toString());
// Delete the Scout so we can have the script re-set it up. @@ -150,9 +151,9 @@ public class ConfigureSatelliteCommandTest extends BaseTestCaseWithUser { return new TestExecutor(); } }; - cmd.updateBoolean(Config.WEB_IS_MONITORING_BACKEND, Boolean.TRUE); + cmd.updateBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND, Boolean.TRUE); assertNull(cmd.storeConfiguration()); - assertTrue(Config.get().getBoolean(Config.WEB_IS_MONITORING_BACKEND)); + assertTrue(Config.get().getBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND)); Long uid = user.getId(); flushAndEvict(user.getOrg()); flushAndEvict(user); @@ -164,7 +165,7 @@ public class ConfigureSatelliteCommandTest extends BaseTestCaseWithUser { db = (DbEnvironment) TestUtils.lookupTestObject( "from com.redhat.rhn.domain.monitoring.config.DbEnvironment"); assertNotSame(randomString, db.getDbName()); - assertNotNull(Config.get().getString(Config.WEB_SCOUT_SHARED_KEY)); + assertNotNull(Config.get().getString(ConfigDefaults.WEB_SCOUT_SHARED_KEY)); ConfigMacro cm = MonitoringConfigFactory.lookupConfigMacroByName("MAIL_MX"); assertFalse(cm.getDefinition().startsWith("**")); assertFalse(cm.getDefinition().endsWith("**")); @@ -180,17 +181,17 @@ public class ConfigureSatelliteCommandTest extends BaseTestCaseWithUser { return new TestExecutor(); } }; - cmd.updateBoolean(Config.WEB_IS_MONITORING_BACKEND, Boolean.TRUE); + cmd.updateBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND, Boolean.TRUE); assertNull(cmd.storeConfiguration()); - assertTrue(Config.get().getBoolean(Config.WEB_IS_MONITORING_BACKEND)); + assertTrue(Config.get().getBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND));
cmd = new ConfigureSatelliteCommand(user) { protected Executor getExecutor() { return new TestExecutor(); } }; - cmd.updateBoolean(Config.WEB_IS_MONITORING_BACKEND, Boolean.FALSE); - assertFalse(Config.get().getBoolean(Config.WEB_IS_MONITORING_BACKEND)); + cmd.updateBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND, Boolean.FALSE); + assertFalse(Config.get().getBoolean(ConfigDefaults.WEB_IS_MONITORING_BACKEND)); }
public void testEnableMonitoringScout() throws Exception { @@ -199,9 +200,9 @@ public class ConfigureSatelliteCommandTest extends BaseTestCaseWithUser { return new TestExecutor(); } }; - cmd.updateBoolean(Config.WEB_IS_MONITORING_SCOUT, Boolean.TRUE); + cmd.updateBoolean(ConfigDefaults.WEB_IS_MONITORING_SCOUT, Boolean.TRUE); assertNull(cmd.storeConfiguration()); - assertTrue(Config.get().getBoolean(Config.WEB_IS_MONITORING_SCOUT)); + assertTrue(Config.get().getBoolean(ConfigDefaults.WEB_IS_MONITORING_SCOUT)); }
public void testUpdateHostname() throws Exception { @@ -212,7 +213,7 @@ public class ConfigureSatelliteCommandTest extends BaseTestCaseWithUser { } };
- cmd.updateString(Config.JABBER_SERVER, "test.hostname.jabber"); + cmd.updateString(ConfigDefaults.JABBER_SERVER, "test.hostname.jabber"); ValidatorError[] verrors = cmd.storeConfiguration(); ConfigMacro sathostname = MonitoringConfigFactory. lookupConfigMacroByName("RHN_SAT_HOSTNAME"); @@ -230,11 +231,11 @@ public class ConfigureSatelliteCommandTest extends BaseTestCaseWithUser { };
String testmount = "/tmp/mount/point"; - cmd.updateString(Config.MOUNT_POINT, testmount); + cmd.updateString(ConfigDefaults.MOUNT_POINT, testmount); ValidatorError[] verrors = cmd.storeConfiguration(); assertNull(verrors); assertEquals(testmount, - Config.get().getString(Config.KICKSTART_MOUNT_POINT)); + Config.get().getString(ConfigDefaults.KICKSTART_MOUNT_POINT)); }
public void testRoles() throws Exception { diff --git a/java/code/src/com/redhat/rhn/manager/session/SessionManager.java b/java/code/src/com/redhat/rhn/manager/session/SessionManager.java index 4f334d5..817e6a0 100644 --- a/java/code/src/com/redhat/rhn/manager/session/SessionManager.java +++ b/java/code/src/com/redhat/rhn/manager/session/SessionManager.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.session;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.hibernate.LookupException; import com.redhat.rhn.common.security.HMAC; import com.redhat.rhn.common.util.TimeUtils; @@ -61,7 +62,8 @@ public class SessionManager extends BaseManager { * @return the lifetime in seconds of the Session. */ public static long lifetimeValue() { - return Long.parseLong(Config.get().getString(Config.WEB_SESSION_DATABASE_LIFETIME)); + return Long.parseLong(Config.get().getString(ConfigDefaults. + WEB_SESSION_DATABASE_LIFETIME)); }
/** @@ -133,15 +135,15 @@ public class SessionManager extends BaseManager { "MessageDigest object"); }
- msgDigest.update(c.getString(Config.WEB_SESSION_SECRET_1).getBytes()); + msgDigest.update(c.getString(ConfigDefaults.WEB_SESSION_SECRET_1).getBytes()); msgDigest.update(":".getBytes()); - msgDigest.update(c.getString(Config.WEB_SESSION_SECRET_2).getBytes()); + msgDigest.update(c.getString(ConfigDefaults.WEB_SESSION_SECRET_2).getBytes()); msgDigest.update(":".getBytes()); msgDigest.update(data.getBytes()); msgDigest.update(":".getBytes()); - msgDigest.update(c.getString(Config.WEB_SESSION_SECRET_3).getBytes()); + msgDigest.update(c.getString(ConfigDefaults.WEB_SESSION_SECRET_3).getBytes()); msgDigest.update(":".getBytes()); - msgDigest.update(c.getString(Config.WEB_SESSION_SECRET_4).getBytes()); + msgDigest.update(c.getString(ConfigDefaults.WEB_SESSION_SECRET_4).getBytes());
return HMAC.byteArrayToHex(msgDigest.digest()); } diff --git a/java/code/src/com/redhat/rhn/manager/session/test/SessionManagerTest.java b/java/code/src/com/redhat/rhn/manager/session/test/SessionManagerTest.java index aceb857..b95a11a 100644 --- a/java/code/src/com/redhat/rhn/manager/session/test/SessionManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/session/test/SessionManagerTest.java @@ -16,6 +16,7 @@ package com.redhat.rhn.manager.session.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.hibernate.LookupException; import com.redhat.rhn.common.util.TimeUtils; import com.redhat.rhn.domain.session.InvalidSessionIdException; @@ -35,7 +36,7 @@ public class SessionManagerTest extends RhnBaseTestCase { public void testLifetimeValue() throws Exception { long lifetime = SessionManager.lifetimeValue(); long duration = Long.parseLong(Config.get().getString( - Config.WEB_SESSION_DATABASE_LIFETIME)); + ConfigDefaults.WEB_SESSION_DATABASE_LIFETIME)); assertEquals(lifetime, duration); }
diff --git a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java index 4c80bba..249931b 100644 --- a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java +++ b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java @@ -14,13 +14,6 @@ */ package com.redhat.rhn.manager.ssm;
-import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Arrays; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.domain.channel.Channel; @@ -28,10 +21,19 @@ import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.channel.ssm.ChannelActionDAO; +import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.system.SystemManager; -import com.redhat.rhn.manager.channel.ChannelManager; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map;
/** * The current plan for this class is to manage all SSM operations. However, as more is diff --git a/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java b/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java index 1943348..917d187 100644 --- a/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java +++ b/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java @@ -14,10 +14,6 @@ */ package com.redhat.rhn.manager.ssm;
-import java.util.HashMap; -import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; @@ -25,6 +21,12 @@ import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.BaseManager;
+import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.HashMap; +import java.util.Map; + /** * Handles the tracking of SSM asynchronous operations, providing functionality for * the creation, update, and retrieval of the data. diff --git a/java/code/src/com/redhat/rhn/manager/ssm/test/SsmOperationDataPopulatorTest.java b/java/code/src/com/redhat/rhn/manager/ssm/test/SsmOperationDataPopulatorTest.java index f380e99..cf6f659 100644 --- a/java/code/src/com/redhat/rhn/manager/ssm/test/SsmOperationDataPopulatorTest.java +++ b/java/code/src/com/redhat/rhn/manager/ssm/test/SsmOperationDataPopulatorTest.java @@ -14,8 +14,6 @@ */ package com.redhat.rhn.manager.ssm.test;
-import java.util.ArrayList; -import java.util.List; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.SetCleanup; import com.redhat.rhn.domain.server.Server; @@ -27,6 +25,9 @@ import com.redhat.rhn.manager.rhnset.RhnSetManager; import com.redhat.rhn.manager.ssm.SsmOperationManager; import com.redhat.rhn.testing.RhnBaseTestCase;
+import java.util.ArrayList; +import java.util.List; + /** * Populates the database with sample SSM operation log entries, used primarily for * development and debugging of the UI pages for this feature. diff --git a/java/code/src/com/redhat/rhn/manager/ssm/test/SsmOperationManagerTest.java b/java/code/src/com/redhat/rhn/manager/ssm/test/SsmOperationManagerTest.java index a89d03f..e339b38 100644 --- a/java/code/src/com/redhat/rhn/manager/ssm/test/SsmOperationManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/ssm/test/SsmOperationManagerTest.java @@ -14,20 +14,21 @@ */ package com.redhat.rhn.manager.ssm.test;
-import java.util.Map; import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.domain.server.test.ServerFactoryTest; -import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.rhnset.RhnSet; import com.redhat.rhn.domain.rhnset.SetCleanup; -import com.redhat.rhn.manager.ssm.SsmOperationManager; -import com.redhat.rhn.manager.ssm.SsmOperationStatus; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.domain.server.test.ServerFactoryTest; +import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.rhnset.RhnSetDecl; import com.redhat.rhn.manager.rhnset.RhnSetManager; +import com.redhat.rhn.manager.ssm.SsmOperationManager; +import com.redhat.rhn.manager.ssm.SsmOperationStatus; import com.redhat.rhn.testing.RhnBaseTestCase; import com.redhat.rhn.testing.UserTestUtils;
+import java.util.Map; + /** * @version $Revision$ */ diff --git a/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java b/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java index 2c3c9d6..e4f7831 100644 --- a/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/ServerGroupManager.java @@ -14,14 +14,6 @@ */ package com.redhat.rhn.manager.system;
-import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.common.hibernate.LookupException; @@ -38,6 +30,14 @@ import com.redhat.rhn.domain.server.ServerGroupType; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.user.UserFactory;
+import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * ServerGroupManager * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java index 1fe3ed9..0e6a006 100644 --- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java @@ -17,6 +17,7 @@ package com.redhat.rhn.manager.system; import com.redhat.rhn.common.client.ClientCertificate; import com.redhat.rhn.common.client.InvalidCertificateException; import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.CachedStatement; import com.redhat.rhn.common.db.datasource.CallableMode; import com.redhat.rhn.common.db.datasource.DataResult; @@ -132,7 +133,7 @@ public class SystemManager extends BaseManager { */ public static void snapshotServer(Server server, String reason) {
- if (!Config.get().getBoolean(Config.TAKE_SNAPSHOTS)) { + if (!Config.get().getBoolean(ConfigDefaults.TAKE_SNAPSHOTS)) { return; }
@@ -392,7 +393,7 @@ public class SystemManager extends BaseManager { Map params = new HashMap(); params.put("org_id", user.getOrg().getId()); params.put("user_id", user.getId()); - params.put("checkin_threshold", new Integer(Config.get().getInt(Config + params.put("checkin_threshold", new Integer(Config.get().getInt(ConfigDefaults .SYSTEM_CHECKIN_THRESHOLD))); Map elabParams = new HashMap(); return makeDataResult(params, elabParams, pc, m); @@ -478,7 +479,7 @@ public class SystemManager extends BaseManager { Map params = new HashMap(); params.put("org_id", user.getOrg().getId()); params.put("user_id", user.getId()); - params.put("checkin_threshold", new Integer(Config.get().getInt(Config + params.put("checkin_threshold", new Integer(Config.get().getInt(ConfigDefaults .SYSTEM_CHECKIN_THRESHOLD))); Map elabParams = new HashMap(); return makeDataResult(params, elabParams, pc, m); @@ -1392,7 +1393,7 @@ public class SystemManager extends BaseManager { info.setServer(server); info.setVersion(null, version, "1"); server.setProxyInfo(info); - if (Config.get().getBoolean(Config.WEB_SUBSCRIBE_PROXY_CHANNEL)) { + if (Config.get().getBoolean(ConfigDefaults.WEB_SUBSCRIBE_PROXY_CHANNEL)) { Channel proxyChannel = ChannelManager.getProxyChannelByVersion( version, server); if (proxyChannel != null) { @@ -1554,7 +1555,7 @@ public class SystemManager extends BaseManager { ValidatorResult result = new ValidatorResult();
// If this is a Satellite, subscribe to the virt channel if possible: - if (!Config.get().isSpacewalk()) { + if (!ConfigDefaults.get().isSpacewalk()) { subscribeToVirtChannel(server, user, result); }
@@ -1600,7 +1601,7 @@ public class SystemManager extends BaseManager {
// If this is a Satellite and no RHN Tools channel is available // report the error, but continue: - if (!Config.get().isSpacewalk() && toolsChannel == null) { + if (!ConfigDefaults.get().isSpacewalk() && toolsChannel == null) { log.warn("no tools channel found"); result.addWarning(new ValidatorWarning("system.entitle.notoolschannel")); } diff --git a/java/code/src/com/redhat/rhn/manager/system/UpdateChildChannelsCommand.java b/java/code/src/com/redhat/rhn/manager/system/UpdateChildChannelsCommand.java index 30d0928..463fb8e 100644 --- a/java/code/src/com/redhat/rhn/manager/system/UpdateChildChannelsCommand.java +++ b/java/code/src/com/redhat/rhn/manager/system/UpdateChildChannelsCommand.java @@ -14,8 +14,6 @@ */ package com.redhat.rhn.manager.system;
-import org.apache.log4j.Logger; - import com.redhat.rhn.FaultException; import com.redhat.rhn.common.hibernate.LookupException; import com.redhat.rhn.common.security.PermissionException; @@ -27,6 +25,8 @@ import com.redhat.rhn.frontend.xmlrpc.InvalidChannelException; import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException; import com.redhat.rhn.manager.channel.ChannelManager;
+import org.apache.log4j.Logger; + import java.util.ArrayList; import java.util.List;
diff --git a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java index ad7ba59..ac2f86b 100644 --- a/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/system/test/SystemManagerTest.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.manager.system.test;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.WriteMode; @@ -53,13 +53,13 @@ import com.redhat.rhn.domain.server.InstalledPackage; import com.redhat.rhn.domain.server.Location; import com.redhat.rhn.domain.server.ManagedServerGroup; import com.redhat.rhn.domain.server.Network; +import com.redhat.rhn.domain.server.Note; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerConstants; import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.domain.server.ServerGroup; import com.redhat.rhn.domain.server.ServerGroupFactory; import com.redhat.rhn.domain.server.VirtualInstance; -import com.redhat.rhn.domain.server.Note; import com.redhat.rhn.domain.server.test.CPUTest; import com.redhat.rhn.domain.server.test.CustomDataValueTest; import com.redhat.rhn.domain.server.test.DeviceTest; @@ -533,7 +533,7 @@ public class SystemManagerTest extends RhnBaseTestCase { // Test stuff! assertTrue(server.hasEntitlement(EntitlementManager.VIRTUALIZATION)); assertTrue(server.getChannels().contains(rhnTools)); - if (!Config.get().isSpacewalk()) { + if (!ConfigDefaults.get().isSpacewalk()) { assertTrue(server.getChannels().contains(rhelVirt)); }
diff --git a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java index af4d4d2..b213931 100644 --- a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java +++ b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java @@ -14,15 +14,6 @@ */ package com.redhat.rhn.manager.user;
-import java.util.ArrayList; -import java.util.List; -import java.util.regex.Pattern; - -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; - -import org.apache.commons.lang.StringUtils; - import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.hibernate.LookupException; import com.redhat.rhn.common.messaging.MessageQueue; @@ -35,6 +26,15 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.frontend.events.NewUserEvent;
+import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; + +import javax.mail.internet.AddressException; +import javax.mail.internet.InternetAddress; + /** * A command to create or edit users * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminException.java b/java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminException.java index c1d4482..69c7edf 100644 --- a/java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminException.java +++ b/java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminException.java @@ -15,7 +15,6 @@ package com.redhat.rhn.manager.user;
import com.redhat.rhn.common.RhnRuntimeException; - import com.redhat.rhn.domain.user.User;
/** diff --git a/java/code/src/com/redhat/rhn/manager/user/UpdateUserCommand.java b/java/code/src/com/redhat/rhn/manager/user/UpdateUserCommand.java index 19e9ffc..d38e1d8 100644 --- a/java/code/src/com/redhat/rhn/manager/user/UpdateUserCommand.java +++ b/java/code/src/com/redhat/rhn/manager/user/UpdateUserCommand.java @@ -14,6 +14,11 @@ */ package com.redhat.rhn.manager.user;
+import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.domain.user.User; + +import org.apache.commons.lang.StringUtils; + import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -22,11 +27,6 @@ import java.util.regex.Pattern; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress;
-import org.apache.commons.lang.StringUtils; - -import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.domain.user.User; - /** * UpdateUserCommand * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/manager/user/test/UpdateUserCommandTest.java b/java/code/src/com/redhat/rhn/manager/user/test/UpdateUserCommandTest.java index 2aef8dc..82ae863 100644 --- a/java/code/src/com/redhat/rhn/manager/user/test/UpdateUserCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/user/test/UpdateUserCommandTest.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.user.test;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.user.UpdateUserCommand; import com.redhat.rhn.testing.RhnBaseTestCase; @@ -134,7 +135,7 @@ public class UpdateUserCommandTest extends RhnBaseTestCase { assertNotNull(user);
// can't do this if we've encrypted the passwords - if (!Config.get().getBoolean(Config.WEB_ENCRYPTED_PASSWORDS)) { + if (!Config.get().getBoolean(ConfigDefaults.WEB_ENCRYPTED_PASSWORDS)) { String savedPassword = user.getPassword(); user.setPassword(password); assertEquals(savedPassword, user.getPassword()); diff --git a/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java b/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java index 8157ab9..7718d61 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java +++ b/java/code/src/com/redhat/rhn/taskomatic/core/SchedulerKernel.java @@ -15,6 +15,7 @@ package com.redhat.rhn.taskomatic.core;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.conf.ConfigException; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.common.messaging.MessageQueue; @@ -143,13 +144,13 @@ public class SchedulerKernel { }
// get the default tasks first - String[] jobs = config.getStringArray(Config.TASKOMATIC_DEFAULT_TASKS); + String[] jobs = config.getStringArray(ConfigDefaults.TASKOMATIC_DEFAULT_TASKS); if (jobs != null && jobs.length > 0) { jobImpls.addAll(Arrays.asList(jobs)); }
// get other tasks - String[] addlJobs = config.getStringArray(Config.TASKOMATIC_TASKS); + String[] addlJobs = config.getStringArray(ConfigDefaults.TASKOMATIC_TASKS); if (addlJobs != null && addlJobs.length > 0) { jobImpls.addAll(Arrays.asList(addlJobs)); } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java b/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java index 8ead2bb..4b78c74 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/DailySummary.java @@ -15,6 +15,7 @@ package com.redhat.rhn.taskomatic.task;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.common.db.datasource.WriteMode; @@ -187,7 +188,7 @@ public class DailySummary extends SingleThreadedTestableTask { Map params = new HashMap(); params.put("user_id", uid); params.put("checkin_threshold", - Config.get().getInteger(Config.SYSTEM_CHECKIN_THRESHOLD)); + Config.get().getInteger(ConfigDefaults.SYSTEM_CHECKIN_THRESHOLD));
return m.execute(params); } @@ -276,7 +277,7 @@ public class DailySummary extends SingleThreadedTestableTask {
//Lastly, create the url for the link in the email. StringBuffer url = new StringBuffer(); - if (Config.get().getBoolean(Config.SSL_AVAILABLE)) { + if (Config.get().getBoolean(ConfigDefaults.SSL_AVAILABLE)) { url.append("https://"); } else { @@ -383,6 +384,6 @@ public class DailySummary extends SingleThreadedTestableTask { }
private String getHostname() { - return Config.get().getHostname(); + return ConfigDefaults.get().getHostname(); } } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/ErrataCacheTask.java b/java/code/src/com/redhat/rhn/taskomatic/task/ErrataCacheTask.java index d91703d..16412d0 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/ErrataCacheTask.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/ErrataCacheTask.java @@ -14,15 +14,15 @@ */ package com.redhat.rhn.taskomatic.task;
-import org.apache.log4j.Logger; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; - import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.taskomatic.task.errata.ErrataCacheDriver; import com.redhat.rhn.taskomatic.task.threaded.TaskQueue; import com.redhat.rhn.taskomatic.task.threaded.TaskQueueFactory;
+import org.apache.log4j.Logger; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; + /** * ErrataCacheTask * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/ErrataMailer.java b/java/code/src/com/redhat/rhn/taskomatic/task/ErrataMailer.java index 388c60a..16e3315 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/ErrataMailer.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/ErrataMailer.java @@ -15,6 +15,7 @@ package com.redhat.rhn.taskomatic.task;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.common.db.datasource.WriteMode; @@ -246,14 +247,14 @@ public class ErrataMailer extends SingleThreadedTestableTask { //Build the hostname with protocol. Used to create urls for the email. String host; //The protocol from configuration. - if (Config.get().isSSLAvailable()) { + if (ConfigDefaults.get().isSSLAvailable()) { host = "https://"; } else { host = "http://"; } //Add the hostname - host = host + Config.get().getHostname(); + host = host + ConfigDefaults.get().getHostname();
//Build the email body body.append(getEmailBodySummary(errata, host)); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/ErrataQueue.java b/java/code/src/com/redhat/rhn/taskomatic/task/ErrataQueue.java index 73cfd2d..dd532e3 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/ErrataQueue.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/ErrataQueue.java @@ -14,15 +14,15 @@ */ package com.redhat.rhn.taskomatic.task;
-import org.apache.log4j.Logger; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; - import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.taskomatic.task.errata.ErrataQueueDriver; import com.redhat.rhn.taskomatic.task.threaded.TaskQueue; import com.redhat.rhn.taskomatic.task.threaded.TaskQueueFactory;
+import org.apache.log4j.Logger; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; + /** * Manages the pending errata queue * diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/KickstartFileSyncTask.java b/java/code/src/com/redhat/rhn/taskomatic/task/KickstartFileSyncTask.java index c5a6dc4..6416cb8 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/KickstartFileSyncTask.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/KickstartFileSyncTask.java @@ -15,6 +15,7 @@ package com.redhat.rhn.taskomatic.task;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; @@ -64,7 +65,7 @@ public class KickstartFileSyncTask extends SingleThreadedTestableTask {
CobblerConnection cc = CobblerXMLRPCHelper.getConnection( - Config.get().getString(Config.COBBLER_AUTOMATED_USER)); + Config.get().getString(ConfigDefaults.COBBLER_AUTOMATED_USER));
List<KickstartData> kickstarts = KickstartFactory.listAllKickstartData(); for (KickstartData ks : kickstarts) { diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java b/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java index 4efb5fe..a173ced 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/SatelliteCertificateCheck.java @@ -15,6 +15,7 @@ package com.redhat.rhn.taskomatic.task;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.messaging.Mail; import com.redhat.rhn.common.messaging.SmtpMail; @@ -47,7 +48,7 @@ public class SatelliteCertificateCheck extends SingleThreadedTask { if (man.isSatelliteCertExpired()) { sendMessage(ls.getMessage("email.satellitecert.expired.subject"), ls.getMessage("email.satellitecert.expired.body", - Config.get().getHostname())); + ConfigDefaults.get().getHostname())); } else if (man.isSatelliteCertInGracePeriod()) { long daysUntilExpiration = (man.getGracePeriodEndDate().getTime() - @@ -55,7 +56,7 @@ public class SatelliteCertificateCheck extends SingleThreadedTask { 86400000;
Object[] args = new String[2]; - args[0] = Config.get().getHostname(); + args[0] = ConfigDefaults.get().getHostname(); args[1] = new Long(daysUntilExpiration).toString(); sendMessage(ls.getMessage("email.satellitecert.graceperiod.subject"), ls.getMessage("email.satellitecert.graceperiod.body", args)); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/SummaryPopulation.java b/java/code/src/com/redhat/rhn/taskomatic/task/SummaryPopulation.java index f0bb1f9..5818696 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/SummaryPopulation.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/SummaryPopulation.java @@ -15,6 +15,7 @@ package com.redhat.rhn.taskomatic.task;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; @@ -93,7 +94,7 @@ public class SummaryPopulation extends SingleThreadedTask { TaskConstants.TASK_QUERY_SUMMARYPOP_AWOL_SERVER_IN_ORGS);
Map params = new HashMap(); - int checkin = Config.get().getInt(Config.SYSTEM_CHECKIN_THRESHOLD); + int checkin = Config.get().getInt(ConfigDefaults.SYSTEM_CHECKIN_THRESHOLD); if (log.isDebugEnabled()) { log.debug("Server checkin threshold for AWOL servers: " + checkin); } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/entitlement/EntitlementQueueDriver.java b/java/code/src/com/redhat/rhn/taskomatic/task/entitlement/EntitlementQueueDriver.java index a8038ab..0a20ee9 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/entitlement/EntitlementQueueDriver.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/entitlement/EntitlementQueueDriver.java @@ -14,13 +14,6 @@ */ package com.redhat.rhn.taskomatic.task.entitlement;
-import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import org.apache.log4j.Logger; - import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.db.datasource.ModeFactory; @@ -28,6 +21,13 @@ import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.taskomatic.task.threaded.QueueDriver; import com.redhat.rhn.taskomatic.task.threaded.QueueWorker;
+import org.apache.log4j.Logger; + +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + /** * Driver for the threaded entitlement queue * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/entitlement/EntitlementWorker.java b/java/code/src/com/redhat/rhn/taskomatic/task/entitlement/EntitlementWorker.java index f267990..c1180b1 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/entitlement/EntitlementWorker.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/entitlement/EntitlementWorker.java @@ -14,11 +14,6 @@ */ package com.redhat.rhn.taskomatic.task.entitlement;
-import java.util.HashMap; -import java.util.Map; - -import org.apache.log4j.Logger; - import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.db.datasource.CallableMode; import com.redhat.rhn.common.db.datasource.ModeFactory; @@ -27,6 +22,11 @@ import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.taskomatic.task.threaded.QueueWorker; import com.redhat.rhn.taskomatic.task.threaded.TaskQueue;
+import org.apache.log4j.Logger; + +import java.util.HashMap; +import java.util.Map; + /** * Performs an entitlement recalc for a single org * diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheDriver.java b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheDriver.java index f48569f..2417c7e 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheDriver.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheDriver.java @@ -14,14 +14,6 @@ */ package com.redhat.rhn.taskomatic.task.errata;
-import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import org.apache.log4j.Logger; - import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.domain.task.Task; import com.redhat.rhn.domain.task.TaskFactory; @@ -29,6 +21,14 @@ import com.redhat.rhn.taskomatic.task.ErrataCacheTask; import com.redhat.rhn.taskomatic.task.threaded.QueueDriver; import com.redhat.rhn.taskomatic.task.threaded.QueueWorker;
+import org.apache.log4j.Logger; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + /** * Driver for the threaded errata cache update queue * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheWorker.java b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheWorker.java index ddb9fd4..885e170 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheWorker.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataCacheWorker.java @@ -14,12 +14,6 @@ */ package com.redhat.rhn.taskomatic.task.errata;
-import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import org.apache.log4j.Logger; - import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.common.hibernate.HibernateFactory; @@ -28,6 +22,12 @@ import com.redhat.rhn.manager.errata.cache.UpdateErrataCacheCommand; import com.redhat.rhn.taskomatic.task.threaded.QueueWorker; import com.redhat.rhn.taskomatic.task.threaded.TaskQueue;
+import org.apache.log4j.Logger; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + /** * Performs errata cache recalc for a given server or channel * @version $Rev $ diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueDriver.java b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueDriver.java index 142836e..c6ab023 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueDriver.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueDriver.java @@ -14,14 +14,6 @@ */ package com.redhat.rhn.taskomatic.task.errata;
-import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import org.apache.log4j.Logger; - import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; @@ -31,6 +23,14 @@ import com.redhat.rhn.taskomatic.task.TaskConstants; import com.redhat.rhn.taskomatic.task.threaded.QueueDriver; import com.redhat.rhn.taskomatic.task.threaded.QueueWorker;
+import org.apache.log4j.Logger; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + /** * Driver for the threaded errata queue * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/ChannelRepodataDriver.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/ChannelRepodataDriver.java index 3b98b59..9ee1ff6 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/ChannelRepodataDriver.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/ChannelRepodataDriver.java @@ -20,9 +20,9 @@ import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.taskomatic.task.ChannelRepodata; +import com.redhat.rhn.taskomatic.task.TaskConstants; import com.redhat.rhn.taskomatic.task.threaded.QueueDriver; import com.redhat.rhn.taskomatic.task.threaded.QueueWorker; -import com.redhat.rhn.taskomatic.task.TaskConstants;
import org.apache.log4j.Logger;
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/ChannelRepodataWorker.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/ChannelRepodataWorker.java index d95fce3..70ba25f 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/ChannelRepodataWorker.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/ChannelRepodataWorker.java @@ -15,17 +15,19 @@ package com.redhat.rhn.taskomatic.task.repomd;
import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.db.datasource.SelectMode; import com.redhat.rhn.common.db.datasource.WriteMode; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; +import com.redhat.rhn.taskomatic.task.TaskConstants; import com.redhat.rhn.taskomatic.task.threaded.QueueWorker; import com.redhat.rhn.taskomatic.task.threaded.TaskQueue; -import com.redhat.rhn.taskomatic.task.TaskConstants;
import org.apache.log4j.Logger; + import java.util.HashMap; import java.util.List; import java.util.Map; @@ -51,9 +53,10 @@ public class ChannelRepodataWorker implements QueueWorker { */ public ChannelRepodataWorker(Map workItem, Logger parentLogger) { logger = parentLogger; - String prefixPath = Config.get().getString(Config.REPOMD_PATH_PREFIX, + String prefixPath = Config.get().getString(ConfigDefaults.REPOMD_PATH_PREFIX, "rhn/repodata"); - String mountPoint = Config.get().getString(Config.REPOMD_CACHE_MOUNT_POINT, "/pub"); + String mountPoint = + Config.get().getString(ConfigDefaults.REPOMD_CACHE_MOUNT_POINT, "/pub"); channelLabelToProcess = (String) workItem.get("channel_label"); repoWriter = new RepositoryWriter(prefixPath, mountPoint); logger.info("Creating ChannelRepodataWorker with prefixPath(" + prefixPath + diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java index 72c296d..6750f47 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java @@ -14,6 +14,8 @@ */ package com.redhat.rhn.taskomatic.task.repomd;
+import com.redhat.rhn.common.util.StringUtil; + import java.io.Closeable; import java.io.Flushable; import java.io.IOException; @@ -23,8 +25,6 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.zip.GZIPOutputStream;
-import com.redhat.rhn.common.util.StringUtil; - /** * * @version $Rev $ diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/FilelistsXmlWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/FilelistsXmlWriter.java index c0771ee..3a0a766 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/FilelistsXmlWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/FilelistsXmlWriter.java @@ -15,15 +15,15 @@
package com.redhat.rhn.taskomatic.task.repomd;
-import java.io.Writer; -import java.util.Iterator; - -import org.xml.sax.SAXException; - import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.frontend.dto.PackageDto; import com.redhat.rhn.taskomatic.task.TaskConstants;
+import org.xml.sax.SAXException; + +import java.io.Writer; +import java.util.Iterator; + /** * * @version $Rev $ diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWriter.java index ce79ee7..8ecc26b 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/OtherXmlWriter.java @@ -14,15 +14,15 @@ */ package com.redhat.rhn.taskomatic.task.repomd;
-import java.io.Writer; -import java.util.Iterator; +import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.frontend.dto.PackageDto; +import com.redhat.rhn.taskomatic.task.TaskConstants;
import org.apache.log4j.Logger; import org.xml.sax.SAXException;
-import com.redhat.rhn.domain.channel.Channel; -import com.redhat.rhn.frontend.dto.PackageDto; -import com.redhat.rhn.taskomatic.task.TaskConstants; +import java.io.Writer; +import java.util.Iterator;
/** * diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PackageCapabilityIterator.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PackageCapabilityIterator.java index 104d96b..051e3ac 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PackageCapabilityIterator.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PackageCapabilityIterator.java @@ -14,23 +14,23 @@ */ package com.redhat.rhn.taskomatic.task.repomd;
+import com.redhat.rhn.common.db.NamedPreparedStatement; +import com.redhat.rhn.common.db.datasource.ModeFactory; +import com.redhat.rhn.common.db.datasource.SelectMode; +import com.redhat.rhn.common.hibernate.HibernateFactory; +import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.taskomatic.task.TaskConstants; + +import org.apache.log4j.Logger; + import java.math.BigDecimal; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; +import java.util.Date; import java.util.HashMap; import java.util.Map; -import java.util.Date; - -import org.apache.log4j.Logger; - -import com.redhat.rhn.common.db.NamedPreparedStatement; -import com.redhat.rhn.common.db.datasource.ModeFactory; -import com.redhat.rhn.common.db.datasource.SelectMode; -import com.redhat.rhn.common.hibernate.HibernateFactory; -import com.redhat.rhn.domain.channel.Channel; -import com.redhat.rhn.taskomatic.task.TaskConstants;
/** * diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java index 35896ef..93fd852 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java @@ -15,17 +15,17 @@
package com.redhat.rhn.taskomatic.task.repomd;
-import java.io.Writer; -import java.util.Iterator; +import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.rhnpackage.PackageEvr; +import com.redhat.rhn.frontend.dto.PackageDto; +import com.redhat.rhn.taskomatic.task.TaskConstants;
import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.xml.sax.SAXException;
-import com.redhat.rhn.domain.channel.Channel; -import com.redhat.rhn.domain.rhnpackage.PackageEvr; -import com.redhat.rhn.frontend.dto.PackageDto; -import com.redhat.rhn.taskomatic.task.TaskConstants; +import java.io.Writer; +import java.util.Iterator;
/** * Primary.xml writer class diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdIndexWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdIndexWriter.java index 5866522..186ce95 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdIndexWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdIndexWriter.java @@ -14,13 +14,13 @@ */ package com.redhat.rhn.taskomatic.task.repomd;
-import java.io.IOException; -import java.io.Writer; - import org.apache.xml.serialize.OutputFormat; import org.apache.xml.serialize.XMLSerializer; import org.xml.sax.SAXException;
+import java.io.IOException; +import java.io.Writer; + /** * * @version $Rev $ diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdWriter.java index 350c67b..a60c2c8 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepomdWriter.java @@ -14,11 +14,12 @@ */ package com.redhat.rhn.taskomatic.task.repomd;
-import java.io.IOException; -import java.io.Writer; -import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; +import com.redhat.rhn.common.db.datasource.ModeFactory; +import com.redhat.rhn.common.db.datasource.SelectMode; +import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.rhnpackage.Package; +import com.redhat.rhn.frontend.dto.PackageDto; +import com.redhat.rhn.taskomatic.task.TaskConstants;
import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -26,12 +27,11 @@ import org.apache.xml.serialize.OutputFormat; import org.apache.xml.serialize.XMLSerializer; import org.xml.sax.SAXException;
-import com.redhat.rhn.common.db.datasource.ModeFactory; -import com.redhat.rhn.common.db.datasource.SelectMode; -import com.redhat.rhn.domain.channel.Channel; -import com.redhat.rhn.domain.rhnpackage.Package; -import com.redhat.rhn.frontend.dto.PackageDto; -import com.redhat.rhn.taskomatic.task.TaskConstants; +import java.io.IOException; +import java.io.Writer; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map;
/** * diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java index 45da4d5..1655f1d 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java @@ -14,6 +14,15 @@ */ package com.redhat.rhn.taskomatic.task.repomd;
+import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; +import com.redhat.rhn.common.util.StringUtil; +import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.channel.ClonedChannel; +import com.redhat.rhn.frontend.dto.PackageDto; + +import org.apache.log4j.Logger; + import java.io.BufferedWriter; import java.io.File; import java.io.FileInputStream; @@ -26,18 +35,10 @@ import java.security.DigestInputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Date; -import java.util.Iterator; import java.util.HashMap; +import java.util.Iterator; import java.util.Map;
-import org.apache.log4j.Logger; - -import com.redhat.rhn.domain.channel.Channel; -import com.redhat.rhn.frontend.dto.PackageDto; -import com.redhat.rhn.common.util.StringUtil; -import com.redhat.rhn.common.conf.Config; -import com.redhat.rhn.domain.channel.ClonedChannel; - /** * * @version $Rev $ @@ -213,7 +214,7 @@ public class RepositoryWriter { */ private RepomdIndexData loadCompsFile(Channel channel) { String relativeFilename; - String compsMount = Config.get().getString(Config.MOUNT_POINT); + String compsMount = Config.get().getString(ConfigDefaults.MOUNT_POINT);
if (channel.getComps() == null) { relativeFilename = getCompsFilePath(channel); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java index 77621d8..2da38b7 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java @@ -14,19 +14,19 @@ */ package com.redhat.rhn.taskomatic.task.repomd;
-import java.io.Writer; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Iterator; - -import org.xml.sax.SAXException; - import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.errata.Bug; import com.redhat.rhn.domain.errata.Cve; import com.redhat.rhn.domain.errata.Errata; import com.redhat.rhn.domain.rhnpackage.Package;
+import org.xml.sax.SAXException; + +import java.io.Writer; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Iterator; + /** * UpdateInfo.xml writer class * diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/threaded/QueueDriver.java b/java/code/src/com/redhat/rhn/taskomatic/task/threaded/QueueDriver.java index 7dadd5e..05e4584 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/threaded/QueueDriver.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/threaded/QueueDriver.java @@ -14,10 +14,10 @@ */ package com.redhat.rhn.taskomatic.task.threaded;
-import java.util.List; - import org.apache.log4j.Logger;
+import java.util.List; + /** * "Driver" for a work queue of worker threads * @version $Rev$ diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/threaded/TaskQueue.java b/java/code/src/com/redhat/rhn/taskomatic/task/threaded/TaskQueue.java index 53d6fd0..fd863f8 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/threaded/TaskQueue.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/threaded/TaskQueue.java @@ -14,14 +14,14 @@ */ package com.redhat.rhn.taskomatic.task.threaded;
-import java.util.List; - import EDU.oswego.cs.dl.util.concurrent.Channel; import EDU.oswego.cs.dl.util.concurrent.LinkedQueue; import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
import com.redhat.rhn.common.hibernate.HibernateFactory;
+import java.util.List; + /** * Generic threaded queue suitable for use wherever Taskomatic * tasks need to process a number of work items in parallel. diff --git a/java/code/src/com/redhat/rhn/testing/ActionHelper.java b/java/code/src/com/redhat/rhn/testing/ActionHelper.java index 02692bf..206cf18 100644 --- a/java/code/src/com/redhat/rhn/testing/ActionHelper.java +++ b/java/code/src/com/redhat/rhn/testing/ActionHelper.java @@ -18,9 +18,9 @@ import com.redhat.rhn.common.util.MethodUtil; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnHelper; -import com.redhat.rhn.manager.user.UserManager; import com.redhat.rhn.frontend.taglibs.list.ListTagUtil; import com.redhat.rhn.frontend.taglibs.list.TagHelper; +import com.redhat.rhn.manager.user.UserManager;
import org.apache.struts.action.Action; import org.apache.struts.action.ActionForward; diff --git a/java/code/src/com/redhat/rhn/testing/ChannelTestUtils.java b/java/code/src/com/redhat/rhn/testing/ChannelTestUtils.java index 290e474..c0a6b32 100644 --- a/java/code/src/com/redhat/rhn/testing/ChannelTestUtils.java +++ b/java/code/src/com/redhat/rhn/testing/ChannelTestUtils.java @@ -14,7 +14,7 @@ */ package com.redhat.rhn.testing;
-import com.redhat.rhn.common.conf.Config; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.channel.DistChannelMap; @@ -102,7 +102,7 @@ public class ChannelTestUtils { PackageManagerTest.addPackageToChannel( ChannelManager.RHN_VIRT_HOST_PACKAGE_NAME, rhnTools); PackageManagerTest.addPackageToChannel( - Config.get().getKickstartPackageName(), rhnTools); + ConfigDefaults.get().getKickstartPackageName(), rhnTools);
Channel rhelVirt = diff --git a/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java b/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java index 3c3f0e7..c24f92f 100644 --- a/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java +++ b/java/code/src/com/redhat/rhn/testing/ServerTestUtils.java @@ -14,13 +14,21 @@ */ package com.redhat.rhn.testing;
+import com.redhat.rhn.common.db.datasource.ModeFactory; +import com.redhat.rhn.common.db.datasource.WriteMode; +import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.errata.Errata; +import com.redhat.rhn.domain.errata.test.ErrataFactoryTest; +import com.redhat.rhn.domain.org.Org; import com.redhat.rhn.domain.rhnpackage.Package; +import com.redhat.rhn.domain.rhnpackage.PackageArch; import com.redhat.rhn.domain.rhnpackage.PackageEvr; import com.redhat.rhn.domain.rhnpackage.PackageEvrFactory; -import com.redhat.rhn.domain.rhnpackage.PackageArch; import com.redhat.rhn.domain.rhnpackage.PackageName; import com.redhat.rhn.domain.rhnpackage.test.PackageTest; +import com.redhat.rhn.domain.rhnset.RhnSet; +import com.redhat.rhn.domain.rhnset.SetCleanup; import com.redhat.rhn.domain.role.RoleFactory; import com.redhat.rhn.domain.server.InstalledPackage; import com.redhat.rhn.domain.server.Server; @@ -30,26 +38,19 @@ import com.redhat.rhn.domain.server.VirtualInstance; import com.redhat.rhn.domain.server.test.ServerFactoryTest; import com.redhat.rhn.domain.server.test.VirtualInstanceManufacturer; import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.domain.org.Org; -import com.redhat.rhn.domain.errata.Errata; -import com.redhat.rhn.domain.errata.test.ErrataFactoryTest; -import com.redhat.rhn.domain.rhnset.RhnSet; -import com.redhat.rhn.domain.rhnset.SetCleanup; import com.redhat.rhn.manager.entitlement.EntitlementManager; -import com.redhat.rhn.manager.rhnpackage.PackageManager; -import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.errata.cache.ErrataCacheManager; -import com.redhat.rhn.manager.rhnset.RhnSetManager; +import com.redhat.rhn.manager.rhnpackage.PackageManager; import com.redhat.rhn.manager.rhnset.RhnSetDecl; -import com.redhat.rhn.common.db.datasource.WriteMode; -import com.redhat.rhn.common.db.datasource.ModeFactory; -import com.redhat.rhn.common.hibernate.HibernateFactory; +import com.redhat.rhn.manager.rhnset.RhnSetManager; +import com.redhat.rhn.manager.system.SystemManager;
+import org.hibernate.Session; + +import java.util.HashMap; import java.util.HashSet; -import java.util.Set; import java.util.Map; -import java.util.HashMap; -import org.hibernate.Session; +import java.util.Set;
/** diff --git a/java/code/src/com/redhat/rhn/testing/UserTestUtils.java b/java/code/src/com/redhat/rhn/testing/UserTestUtils.java index 734717c..e9341bd 100644 --- a/java/code/src/com/redhat/rhn/testing/UserTestUtils.java +++ b/java/code/src/com/redhat/rhn/testing/UserTestUtils.java @@ -15,10 +15,6 @@
package com.redhat.rhn.testing;
-import java.util.Set; - -import junit.framework.Assert; - import com.redhat.rhn.common.hibernate.LookupException; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.monitoring.satcluster.SatCluster; @@ -35,6 +31,10 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.domain.user.UserFactory; import com.redhat.rhn.manager.user.UserManager;
+import java.util.Set; + +import junit.framework.Assert; + /** * A class that allows us to easily create test users. * diff --git a/java/code/src/org/cobbler/test/DistroTest.java b/java/code/src/org/cobbler/test/DistroTest.java index df56375..da4e2f7 100644 --- a/java/code/src/org/cobbler/test/DistroTest.java +++ b/java/code/src/org/cobbler/test/DistroTest.java @@ -15,8 +15,8 @@
package org.cobbler.test;
-import org.cobbler.Distro; import org.cobbler.CobblerConnection; +import org.cobbler.Distro;
import java.util.HashMap;
commit 0fa36ec1156540598204caa51dd24ff98d158545 Author: Justin Sherrill jsherril@redhat.com Date: Tue Jun 30 20:01:16 2009 -0400
509037 - fixing issue where looking for packages in child channels would result in base channels
this was seen when a base channel existed with rhncfg packages in it and config deployment was enabled for an activation key
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml index 88cecb1..6dc72be 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml @@ -1046,14 +1046,19 @@ SELECT DISTINCT C.id </query> </mode>
-<mode name="channels_with_package"> - <query params="package"> +<mode name="child_channels_with_package"> + <query params="package, org_id"> SELECT DISTINCT CP.channel_id as id - FROM rhnChannelPackage CP + FROM rhnChannelPackage CP inner join rhnPackage P on CP.package_id = P.id inner join rhnPackageName PN on P.name_id = PN.id + inner join rhnChannel C on C.id = CP.channel_id + inner join rhnAvailableChannels AC on AC.channel_id = C.id WHERE - PN.name = :package + PN.name = :package and + C.parent_channel is not null and + AC.org_id = :org_id + </query> </mode>
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java index bb51633..83e8d73 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java @@ -1507,12 +1507,15 @@ public class ChannelManager extends BaseManager { * Finds the ids of all child channels that contain * a package with the given name. Will only all the child channels. * @param packageName The exact name of the package sought for. + * @param org the org this is in * @return The list of ids */ - public static List<Long> findChildChannelsWithPackage(String packageName) { - SelectMode m = ModeFactory.getMode("Channel_queries", "channels_with_package"); + public static List<Long> findChildChannelsWithPackage(String packageName, Org org) { + SelectMode m = ModeFactory.getMode("Channel_queries", + "child_channels_with_package"); Map params = new HashMap(); params.put("package", packageName); + params.put("org_id", org.getId());
//whittle down until we have the piece we want. DataResult<Map<String, Long>> dr = m.execute(params); diff --git a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java index 8467e61..ee4e5b4 100644 --- a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java +++ b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java @@ -492,7 +492,7 @@ public class ActivationKeyManager { */ List <Long> cids; if (key.getBaseChannel() == null) { - cids = ChannelManager.findChildChannelsWithPackage(packageName); + cids = ChannelManager.findChildChannelsWithPackage(packageName, key.getOrg()); } else { //we know its the channel we want if it has the rhncfg package in it.
commit 135c27d0c96bcbcc72b1a9a071a1ba8f1c69a248 Author: Mike McCune mmccune@gibson.pdx.redhat.com Date: Tue Jun 30 16:24:34 2009 -0700
508790 - switch to /var/lib/libvirt/images for our default path
Instead of having /var/lib/xen which is xen specific we now create all our guests in /var/lib/libvirt/images which is always there and created/owned by libvirt.
diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/code/src/com/redhat/rhn/common/conf/Config.java index 5106870..04b5947 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -175,7 +175,7 @@ public class Config { private static final String DEFAULT_COBBLER_SNIPPET_DIR = "/var/lib/cobbler/snippets";
public static final String VIRT_PATH_DIR = "kickstart.virt_storage_path"; - private static final String DEFAULT_VIRT_PATH = "/var/lib/xen"; + private static final String DEFAULT_VIRT_PATH = "/var/lib/libvirt/images"; public static final String VIRT_BRIDGE = "kickstart.virt_bridge"; public static final String VIRT_MEM = "kickstart.virt_mem_size_mb"; public static final String VIRT_CPU = "kickstart.virt_cpus"; @@ -786,7 +786,7 @@ public class Config { public File getVirtPath() { return new File(getString(VIRT_PATH_DIR, DEFAULT_VIRT_PATH)); } - + /** * Returns the default value for the xen virt bridge * @return the value for virt bridge.
commit b99361d53f3a3ef256cf4f3be9360bdd08d57409 Author: Justin Sherrill jsherril@redhat.com Date: Tue Jun 30 17:33:00 2009 -0400
508966 - fixed issue where could not set package profile for a kickstart, rewrote to new list tag
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java index cbaf6f3..bcf5302 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java @@ -14,53 +14,104 @@ */ package com.redhat.rhn.frontend.action.kickstart;
-import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.kickstart.KickstartData; import com.redhat.rhn.domain.kickstart.KickstartFactory; -import com.redhat.rhn.frontend.listview.PageControl; +import com.redhat.rhn.domain.rhnpackage.profile.Profile; import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.taglibs.list.ListTagHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.profile.ProfileManager; -import com.redhat.rhn.manager.rhnset.RhnSetDecl;
-import java.util.Iterator; -import java.util.LinkedList; +import org.apache.commons.lang.StringUtils; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.HashMap; import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse;
/** * KickstartPackageProfilesEditAction - setup for listing the profiles available * for selection. * @version $Rev: 1 $ */ -public class KickstartPackageProfileSetupAction extends BaseKickstartListSetupAction { +public class KickstartPackageProfileSetupAction extends RhnAction implements Listable { + + + public static final String UPDATE_METHOD = "kickstart.packageprofile.jsp.submit"; + public static final String CLEAR_METHOD = "kickstart.packageprofile.jsp.clear";
/** + * * {@inheritDoc} */ - protected Iterator getCurrentItemsIterator(KickstartData ksdata) { - List l = new LinkedList(); - if (ksdata.getKickstartDefaults().getProfile() != null) { - l.add(ksdata.getKickstartDefaults().getProfile()); + public ActionForward execute(ActionMapping mapping, + ActionForm formIn, + HttpServletRequest request, + HttpServletResponse response) { + + RequestContext context = new RequestContext(request); + + + + KickstartData ks = KickstartFactory.lookupKickstartDataByIdAndOrg( + context.getCurrentUser().getOrg(), context.getRequiredParam("ksid")); + + + ListHelper helper = new ListHelper(this, request); + helper.execute(); + + if (context.wasDispatched("kickstart.packageprofile.jsp.submit")) { + String selected = ListTagHelper.getRadioSelection(helper.getListName(), + request); + if (StringUtils.isNumeric(selected)) { + Profile prof = ProfileManager.lookupByIdAndOrg(new Long(selected), + context.getCurrentUser().getOrg()); + ks.getKickstartDefaults().setProfile(prof); + + Map params = new HashMap(); + params.put("ksid", ks.getId()); + getStrutsDelegate().saveMessage(UPDATE_METHOD, request); + return getStrutsDelegate().forwardParams(mapping.findForward("success"), + params); + } } - return l.iterator(); - } + else if (context.wasDispatched("kickstart.packageprofile.jsp.clear")) { + ks.getKickstartDefaults().setProfile(null); + KickstartFactory.saveKickstartData(ks); + request.setAttribute("ksid", ks.getId()); + Map params = new HashMap(); + params.put("ksid", ks.getId()); + getStrutsDelegate().saveMessage(CLEAR_METHOD, request); + return getStrutsDelegate().forwardParams(mapping.findForward("success"), + params);
- /** - * {@inheritDoc} - */ - public RhnSetDecl getSetDecl() { - return RhnSetDecl.PACKAGE_PROFILES; + } + if (ks.getKickstartDefaults().getProfile() != null) { + ListTagHelper.selectRadioValue(helper.getListName(), + ks.getKickstartDefaults().getProfile().getId().toString(), request); + } + return mapping.findForward("default"); }
/** + * * {@inheritDoc} */ - protected DataResult getDataResult(RequestContext rctx, PageControl pc) { + public List getResult(RequestContext rctx) { KickstartData ksdata = KickstartFactory - .lookupKickstartDataByIdAndOrg(rctx.getCurrentUser().getOrg(), - rctx.getRequiredParam(RequestContext.KICKSTART_ID)); + .lookupKickstartDataByIdAndOrg(rctx.getCurrentUser().getOrg(), + rctx.getRequiredParam(RequestContext.KICKSTART_ID));
return ProfileManager.compatibleWithChannel( - ksdata.getKickstartDefaults().getKstree().getChannel(), - rctx.getCurrentUser().getOrg(), pc); + ksdata.getKickstartDefaults().getKstree().getChannel(), + rctx.getCurrentUser().getOrg(), null); } + } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSubmitAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSubmitAction.java deleted file mode 100644 index df9dc12..0000000 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSubmitAction.java +++ /dev/null @@ -1,177 +0,0 @@ -/** - * Copyright (c) 2009 Red Hat, Inc. - * - * This software is licensed to you under the GNU General Public License, - * version 2 (GPLv2). There is NO WARRANTY for this software, express or - * implied, including the implied warranties of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 - * along with this software; if not, see - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * - * Red Hat trademarks are not licensed under GPLv2. No permission is - * granted to use or replicate Red Hat trademarks that are incorporated - * in this software or its documentation. - */ -package com.redhat.rhn.frontend.action.kickstart; - -import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.domain.kickstart.KickstartData; -import com.redhat.rhn.domain.kickstart.KickstartFactory; -import com.redhat.rhn.domain.rhnpackage.profile.Profile; -import com.redhat.rhn.domain.rhnpackage.profile.ProfileFactory; -import com.redhat.rhn.domain.rhnset.RhnSet; -import com.redhat.rhn.domain.rhnset.RhnSetElement; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.manager.kickstart.KickstartPackageProfileCommand; -import com.redhat.rhn.manager.profile.ProfileManager; -import com.redhat.rhn.manager.rhnset.RhnSetDecl; -import com.redhat.rhn.manager.rhnset.RhnSetManager; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * KickstartPackageProfileSubmitAction - * @version $Rev$ - */ -public class KickstartPackageProfileSubmitAction extends - BaseKickstartListSubmitAction { - - public static final String UPDATE_METHOD = "kickstart.packageprofile.jsp.submit"; - public static final String CLEAR_METHOD = "kickstart.packageprofile.jsp.clear"; - - /** - * {@inheritDoc} - */ - protected void operateOnRemovedElements(List elements, - HttpServletRequest request) { - - if (elements.size() > 0) { - RequestContext rctx = new RequestContext(request); - KickstartPackageProfileCommand cmd = new - KickstartPackageProfileCommand( - rctx.getRequiredParam(RequestContext.KICKSTART_ID), - rctx.getCurrentUser()); - cmd.setProfile(null); - cmd.store(); - } - } - - /** - * {@inheritDoc} - */ - protected void operateOnAddedElements(List elements, - HttpServletRequest request) { - - RequestContext rctx = new RequestContext(request); - KickstartPackageProfileCommand cmd = new - KickstartPackageProfileCommand( - rctx.getRequiredParam(RequestContext.KICKSTART_ID), - rctx.getCurrentUser()); - Long pid = null; - if (elements.size() > 0) { - pid = ((RhnSetElement) elements.get(0)).getElement(); - Profile p = ProfileFactory.lookupByIdAndOrg(pid, - rctx.getCurrentUser().getOrg()); - cmd.setProfile(p); - cmd.store(); - } - - } - - /** - * {@inheritDoc} - */ - public RhnSetDecl getSetDecl() { - return RhnSetDecl.PACKAGE_PROFILES; - } - - /** - * {@inheritDoc} - */ - protected DataResult getDataResult(User user, - ActionForm formIn, - HttpServletRequest request) { - - RequestContext rctx = new RequestContext(request); - KickstartData ksdata = KickstartFactory - .lookupKickstartDataByIdAndOrg(rctx.getCurrentUser().getOrg(), - rctx.getRequiredParam(RequestContext.KICKSTART_ID)); - - DataResult dr = ProfileManager.compatibleWithChannel( - ksdata.getKickstartDefaults().getKstree().getChannel(), - rctx.getCurrentUser().getOrg(), null); - return dr; - } - - /** - * {@inheritDoc} - */ - protected void processMethodKeys(Map map) { - map.put(UPDATE_METHOD, "operateOnDiff"); - map.put(CLEAR_METHOD, "clearSelection"); - } - - protected Iterator getCurrentItemsIterator(RequestContext ctx) { - KickstartData ksdata = KickstartFactory - .lookupKickstartDataByIdAndOrg(ctx.getCurrentUser().getOrg(), - ctx.getRequiredParam(RequestContext.KICKSTART_ID)); - - List l = new LinkedList(); - if (ksdata.getKickstartDefaults().getProfile() != null) { - l.add(ksdata.getKickstartDefaults().getProfile()); - } - return l.iterator(); - - } - - /** - * This is executed if the clear button is pushed. Clears all associated package - * profiles from from the selected kickstart - * - * @param mapping The ActionMapping used to select this instance - * @param formIn The optional ActionForm bean for this request (if any) - * @param request The HTTP request we are processing - * @param response The HTTP response we are creating - * @return Describes where and how control should be forwarded. - */ - public ActionForward clearSelection(ActionMapping mapping, - ActionForm formIn, - HttpServletRequest request, - HttpServletResponse response) { - - RequestContext rctx = new RequestContext(request); - KickstartPackageProfileCommand cmd = new - KickstartPackageProfileCommand( - rctx.getRequiredParam(RequestContext.KICKSTART_ID), - rctx.getCurrentUser()); - cmd.setProfile(null); - cmd.store(); - - ArrayList added = new ArrayList(); - ArrayList removed = new ArrayList(); - - RhnSet currentSet = updateSet(request); - for (Iterator it = currentSet.getElements().iterator(); it.hasNext();) { - removed.add(it.next()); - } - currentSet.clear(); - RhnSetManager.store(currentSet); - - generateUserMessage(added, removed, request); - Map params = makeParamMap(formIn, request); - return getStrutsDelegate().forwardParams(mapping.findForward("default"), params); - } - -} diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPackageProfileActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPackageProfileActionTest.java index bd2bd4f..2d8d53a 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPackageProfileActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/test/KickstartPackageProfileActionTest.java @@ -19,7 +19,7 @@ import com.redhat.rhn.domain.kickstart.KickstartFactory; import com.redhat.rhn.domain.kickstart.test.KickstartDataTest; import com.redhat.rhn.domain.rhnpackage.profile.Profile; import com.redhat.rhn.domain.role.RoleFactory; -import com.redhat.rhn.frontend.action.kickstart.KickstartPackageProfileSubmitAction; +import com.redhat.rhn.frontend.action.kickstart.KickstartPackageProfileSetupAction; import com.redhat.rhn.frontend.dto.ProfileDto; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.manager.profile.test.ProfileManagerTest; @@ -61,7 +61,7 @@ public class KickstartPackageProfileActionTest extends RhnMockStrutsTestCase { user.addRole(RoleFactory.ORG_ADMIN); Profile p = ProfileManagerTest.createProfileWithServer(user); addSelectedItem(p.getId()); - addDispatchCall(KickstartPackageProfileSubmitAction.UPDATE_METHOD); + addDispatchCall(KickstartPackageProfileSetupAction.UPDATE_METHOD); setRequestPathInfo("/kickstart/KickstartPackageProfileEditSubmit"); actionPerform(); // Gotta make sure we can update the profile to the same entry twice diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/list/RadioColumnTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/list/RadioColumnTag.java index 8f63ec0..64a3f51 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/list/RadioColumnTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/list/RadioColumnTag.java @@ -45,6 +45,7 @@ public class RadioColumnTag extends TagSupport { private String valueExpr; private String headerStyle; private String headerKey; + private boolean useDefault = true;
/** * Sets the column width @@ -135,7 +136,7 @@ public class RadioColumnTag extends TagSupport { radio.setAttribute("type", "radio"); radio.setAttribute("name", getRadioName(listName)); radio.setAttribute("value", value); - if (StringUtils.isBlank(getRadioValue())) { + if (StringUtils.isBlank(getRadioValue()) && useDefault) { pageContext.getRequest().setAttribute(getRadioName(listName), value); } if (isSelected()) { @@ -229,4 +230,20 @@ public class RadioColumnTag extends TagSupport { width = "20px"; headerStyle = null; } + + + /** + * @return Returns the setDefault. + */ + public boolean isUseDefault() { + return useDefault; + } + + + /** + * @param setDefaultIn The setDefault to set. + */ + public void setUseDefault(boolean setDefaultIn) { + this.useDefault = setDefaultIn; + } } diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld b/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld index 95e8598..2450ad1 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/rhn-list.tld @@ -242,6 +242,11 @@ <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> + <attribute> + <name>useDefault</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> </tag> <tag> <name>csv</name> diff --git a/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp b/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp index 42fc4fb..f9652fe 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/packageprofiles.jsp @@ -2,6 +2,8 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> +<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> +
<html:html xhtml="true"> <body> @@ -19,34 +21,31 @@ </p> <c:set var="pageList" value="${requestScope.pageList}" />
- <form method="post" name="rhn_list" action="/rhn/kickstart/KickstartPackageProfileEditSubmit.do"> - <rhn:submitted /> - <rhn:list pageList="${pageList}" noDataText="kickstart.packageprofiles.jsp.noprofiles"> - - <rhn:listdisplay set="${requestScope.set}" hiddenvars="${requestScope.newset}"> - <rhn:set type="radio" value="${current.id}" buttons="false"/> +<rl:listset name="profiles" > + <rl:list emptykey="kickstart.packageprofiles.jsp.noprofiles"> + <rl:decorator name = "PageSizeDecorator"/> + <rl:radiocolumn value="${current.id}" styleclass="first-column" useDefault='false'/>
- <rhn:column header="kickstart.packageprofiles.jsp.description"> + <rl:column headerkey="kickstart.packageprofiles.jsp.description" filterattr="name"> ${current.name} - </rhn:column> - </rhn:listdisplay> - </rhn:list> -<p> -<bean:message key="kickstart.packageprofiles.jsp.tip" arg0="${ksdata.id}"/> -</p> -<hr /> -<input type="hidden" name="ksid" value="<c:out value="${param.ksid}"/>" /> -<div align="right"> - <html:submit property="dispatch"> - <bean:message key="kickstart.packageprofile.jsp.clear"/> - </html:submit> - <html:submit property="dispatch"> - <bean:message key="kickstart.packageprofile.jsp.submit"/> - </html:submit> - -</div> - - </form> + </rl:column> + </rl:list> + <p> + <bean:message key="kickstart.packageprofiles.jsp.tip" arg0="${ksdata.id}"/> + </p> + <hr /> + <input type="hidden" name="ksid" value="<c:out value="${param.ksid}"/>" /> + <div align="right"> + <html:submit property="dispatch"> + <bean:message key="kickstart.packageprofile.jsp.clear"/> + </html:submit> + <html:submit property="dispatch"> + <bean:message key="kickstart.packageprofile.jsp.submit"/> + </html:submit> + + </div> + <rhn:submitted /> + </rl:listset> </div>
</body> diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 5bd6f16..6baa745 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -5160,17 +5160,10 @@ scope="request" input="/WEB-INF/pages/kickstart/packageprofiles.jsp" type="com.redhat.rhn.frontend.action.kickstart.KickstartPackageProfileSetupAction"> - <forward name="default" - path="/WEB-INF/pages/kickstart/packageprofiles.jsp"/> - </action> - - <action path="/kickstart/KickstartPackageProfileEditSubmit" - scope="request" - input="/WEB-INF/pages/kickstart/packageprofiles.jsp" - type="com.redhat.rhn.frontend.action.kickstart.KickstartPackageProfileSubmitAction" - parameter="dispatch"> - <forward name="default" - path="/kickstart/KickstartPackageProfileEdit.do"/> + <forward name="default" + path="/WEB-INF/pages/kickstart/packageprofiles.jsp" /> + <forward name="success" + path="/kickstart/KickstartPackageProfileEdit.do" redirect="true"/> </action>
<action path="/kickstart/DownloadLog"
commit 5a8020f3d83c09bb9acbd5c65cf66758a499c98e Author: Mike McCune mmccune@gibson.pdx.redhat.com Date: Tue Jun 30 13:12:18 2009 -0700
508790 - fixing tabs
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java index 317055d..e3f966a 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java @@ -759,15 +759,17 @@ public class KickstartDataTest extends BaseTestCaseWithUser { }
public void testDefaultBridge() throws Exception { - KickstartData k = createKickstartWithChannel(user.getOrg()); - k.getKickstartDefaults(). - setVirtualizationType(KickstartVirtualizationType.kvmGuest()); - - assertTrue(k.getDefaultVirtBridge().equals(Config.get().getDefaultKVMVirtBridge())); - - k.getKickstartDefaults(). - setVirtualizationType(KickstartVirtualizationType.xenPV()); - - assertTrue(k.getDefaultVirtBridge().equals(Config.get().getDefaultXenVirtBridge())); + KickstartData k = createKickstartWithChannel(user.getOrg()); + k.getKickstartDefaults().setVirtualizationType( + KickstartVirtualizationType.kvmGuest()); + + assertTrue(k.getDefaultVirtBridge().equals( + Config.get().getDefaultKVMVirtBridge())); + + k.getKickstartDefaults().setVirtualizationType( + KickstartVirtualizationType.xenPV()); + + assertTrue(k.getDefaultVirtBridge().equals( + Config.get().getDefaultXenVirtBridge())); } }
commit 7387b64ad2241c37ab1ce5c2fc734c1510fae514 Author: Devan Goodwin dgoodwin@redhat.com Date: Tue Jun 30 15:57:48 2009 -0300
508789 - Block deletion of last remaining Satellite Administrator.
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 809f4c1..d17484b 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 @@ -21,6 +21,7 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.struts.RequestContext; import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.acl.AclManager; +import com.redhat.rhn.manager.user.DeleteSatAdminException; import com.redhat.rhn.manager.user.UserManager;
import org.apache.struts.action.ActionErrors; @@ -83,7 +84,20 @@ public class DeleteUserAction extends RhnAction { return getStrutsDelegate().forwardParams(mapping.findForward("failure"), params); } - UserManager.deleteUser(loggedInUser, uid); + + try { + UserManager.deleteUser(loggedInUser, uid); + } + catch (DeleteSatAdminException e) { + errors.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("user.cannot.delete.last.sat.admin")); + Map params = new HashMap(); + params.put("uid", uid); + addErrors(request, errors); + return getStrutsDelegate().forwardParams(mapping.findForward("failure"), + params); + } + ActionMessages msg = new ActionMessages(); msg.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("user.delete", user.getLogin())); diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index a1d65ac..32fafc1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -1085,6 +1085,13 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" </context-group> </trans-unit>
+ <trans-unit id="user.cannot.delete.last.sat.admin"> +<source>Cannot delete the last remaining satellite administrator.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/DeleteUser</context> + </context-group> + </trans-unit> + <trans-unit id="Users/Servers"> <source>Users/Servers</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/DeleteUserException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/DeleteUserException.java new file mode 100644 index 0000000..4d5b2c8 --- /dev/null +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/DeleteUserException.java @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ + +package com.redhat.rhn.frontend.xmlrpc; + +import com.redhat.rhn.FaultException; +import com.redhat.rhn.common.localization.LocalizationService; + +/** + * Delete User Exception + * + * Thrown whenever a problem occurs deleting a user. + * + * @version $Rev$ + */ +public class DeleteUserException extends FaultException { + + /** + * Constructor + * @param resourceKey Resource bundle key for error message to return. + */ + public DeleteUserException(String resourceKey) { + super(2601, "Error deleting user", LocalizationService.getInstance(). + getMessage(resourceKey, new Object [] {})); + } + +} + diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java index 15ae77f..71fcd0c 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/user/UserHandler.java @@ -14,6 +14,10 @@ */ package com.redhat.rhn.frontend.xmlrpc.user;
+import com.redhat.rhn.frontend.xmlrpc.DeleteUserException; + +import com.redhat.rhn.manager.user.DeleteSatAdminException; + import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -535,7 +539,13 @@ public class UserHandler extends BaseHandler { User loggedInUser = getLoggedInUser(sessionKey); ensureOrgAdmin(loggedInUser); User target = XmlRpcUserHelper.getInstance().lookupTargetUser(loggedInUser, login); - UserManager.deleteUser(loggedInUser, target.getId()); + + try { + UserManager.deleteUser(loggedInUser, target.getId()); + } + catch (DeleteSatAdminException e) { + throw new DeleteUserException("user.cannot.delete.last.sat.admin"); + }
return 1; } diff --git a/java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminException.java b/java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminException.java new file mode 100644 index 0000000..c1d4482 --- /dev/null +++ b/java/code/src/com/redhat/rhn/manager/user/DeleteSatAdminException.java @@ -0,0 +1,52 @@ +/** + * Copyright (c) 2009 Red Hat, Inc. + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ +package com.redhat.rhn.manager.user; + +import com.redhat.rhn.common.RhnRuntimeException; + +import com.redhat.rhn.domain.user.User; + +/** + * DeleteSatAdminException + * + * Exception thrown when we cannot delete a Satellite administrator. (presumably because + * they are the last remaining) + * + * @version $Rev$ + */ +public class DeleteSatAdminException extends RhnRuntimeException { + + private User targetUser; + + /** + * Constructor + * + * @param targetUserIn User we could not delete. + */ + public DeleteSatAdminException(User targetUserIn) { + super(); + this.targetUser = targetUserIn; + } + + /** + * Return the target user we could not delete. + * + * @return target user + */ + public User getTargetUser() { + return targetUser; + } + +} diff --git a/java/code/src/com/redhat/rhn/manager/user/UserManager.java b/java/code/src/com/redhat/rhn/manager/user/UserManager.java index b2c26e1..ae9208f 100644 --- a/java/code/src/com/redhat/rhn/manager/user/UserManager.java +++ b/java/code/src/com/redhat/rhn/manager/user/UserManager.java @@ -40,6 +40,7 @@ import com.redhat.rhn.frontend.dto.SystemSearchResult; import com.redhat.rhn.frontend.listview.PageControl; import com.redhat.rhn.frontend.taglibs.list.decorators.PageSizeDecorator; import com.redhat.rhn.manager.BaseManager; +import com.redhat.rhn.manager.SatManager;
import org.apache.commons.lang.BooleanUtils; import org.apache.log4j.Logger; @@ -450,6 +451,16 @@ public class UserManager extends BaseManager { pex.setLocalizedSummary(ls.getMessage("permission.jsp.summary.deleteuser")); throw pex; } + + // Do not allow deletion of the last Satellite Administrator: + User toDelete = UserFactory.lookupById(loggedInUser, targetUid); + if (toDelete.hasRole(RoleFactory.SAT_ADMIN)) { + if (SatManager.getActiveSatAdmins().size() == 1) { + log.warn("Cannot delete the last Satellite Administrator"); + throw new DeleteSatAdminException(toDelete); + } + } + CallableMode m = ModeFactory.getCallableMode("User_queries", "delete_user"); Map inParams = new HashMap();
commit 0df9b87830366aabe192b1a7d7c75d4ee79c1a02 Author: Devan Goodwin dgoodwin@redhat.com Date: Mon Jun 29 10:09:06 2009 -0300
Bumping timeout on Message Queue Test.
It appears to fail sometimes.
diff --git a/java/code/src/com/redhat/rhn/common/messaging/test/MessageQueueTest.java b/java/code/src/com/redhat/rhn/common/messaging/test/MessageQueueTest.java index 077ea62..9ff3c31 100644 --- a/java/code/src/com/redhat/rhn/common/messaging/test/MessageQueueTest.java +++ b/java/code/src/com/redhat/rhn/common/messaging/test/MessageQueueTest.java @@ -227,7 +227,7 @@ public class MessageQueueTest extends RhnBaseTestCase { if (count > 25) { break; } - Thread.sleep(100); + Thread.sleep(500); } if (matchingValue) { assertTrue(wasReceived);
commit 9666fb3f37bf2361db12ea32e111deb64acab9e2 Author: Partha Aji paji@redhat.com Date: Tue Jun 30 15:08:05 2009 -0400
508962 - Fixed KS software edit page to hide repo section if tree is not rhel 5
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 aa2dc00..d69922b 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 @@ -71,7 +71,7 @@ public class KickstartSoftwareEditAction extends BaseKickstartEditAction { String fieldChanged = form.getString("fieldChanged"); KickstartEditCommand cmd = (KickstartEditCommand) cmdIn; KickstartableTree tree = cmd.getKickstartData().getKickstartDefaults().getKstree(); - KickstartHelper kshelper = new KickstartHelper(ctx.getRequest()); + KickstartableTree selectedTree; List trees = null; Long incomingChannelId = (Long) form.get(CHANNEL); Long channelId = incomingChannelId; @@ -88,6 +88,7 @@ public class KickstartSoftwareEditAction extends BaseKickstartEditAction { ctx.getCurrentUser().getOrg()); } setupUrl(ctx, form, kstree); + selectedTree = kstree; } else { if (form.get(CHANNEL) != null) { @@ -104,12 +105,14 @@ public class KickstartSoftwareEditAction extends BaseKickstartEditAction { ctx.getCurrentUser().getOrg()); } setupUrl(ctx, form, kstree); + selectedTree = kstree; } if (fieldChanged.equals("kstree")) { KickstartableTree kstree = KickstartFactory.lookupKickstartTreeByIdAndOrg((Long) form.get(TREE), ctx.getCurrentUser().getOrg()); setupUrl(ctx, form, kstree); + selectedTree = kstree; } ctx.getRequest().setAttribute(TREES, trees); if (trees == null || trees.size() == 0) { @@ -143,7 +146,7 @@ public class KickstartSoftwareEditAction extends BaseKickstartEditAction { if (form.getString(URL) == null) { ctx.getRequest().setAttribute("nourl", "true"); } - setupRepos(ctx, form, cmd.getKickstartData()); + setupRepos(ctx, form, cmd.getKickstartData(), selectedTree); }
private void setupChildChannels(RequestContext ctx, Long channelId, @@ -244,21 +247,27 @@ public class KickstartSoftwareEditAction extends BaseKickstartEditAction { }
private void setupRepos(RequestContext context, - DynaActionForm form, KickstartData ksdata) { - List <LabelValueEnabledBean> repos = new LinkedList<LabelValueEnabledBean>(); - for (String name : RepoInfo.getStandardRepos().keySet()) { - repos.add(lve(name, name, false)); - } - form.set(POSSIBLE_REPOS, (LabelValueEnabledBean[]) - repos.toArray(new LabelValueEnabledBean[0])); - Set<RepoInfo> selected = ksdata.getRepoInfos(); - String [] items = new String[selected.size()]; - int i = 0; - for (RepoInfo repo : selected) { - items[i] = repo.getName(); - i++; + DynaActionForm form, KickstartData ksdata, + KickstartableTree tree) { + + if (tree != null && !tree.getInstallType().isRhel2() && + !tree.getInstallType().isRhel3() && + !tree.getInstallType().isRhel4()) { + List <LabelValueEnabledBean> repos = new LinkedList<LabelValueEnabledBean>(); + for (String name : RepoInfo.getStandardRepos().keySet()) { + repos.add(lve(name, name, false)); + } + form.set(POSSIBLE_REPOS, (LabelValueEnabledBean[]) + repos.toArray(new LabelValueEnabledBean[0])); + Set<RepoInfo> selected = ksdata.getRepoInfos(); + String [] items = new String[selected.size()]; + int i = 0; + for (RepoInfo repo : selected) { + items[i] = repo.getName(); + i++; + } + form.set(SELECTED_REPOS, items); } - form.set(SELECTED_REPOS, items); }
/** diff --git a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp index eea1562..cda5b3d 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/softwareedit.jsp @@ -101,10 +101,11 @@ function reloadForm(ctl) { </c:choose> </td> </tr> + <c:if test = "${not empty kickstartSoftwareForm.map.possibleRepos}"> <tr> <th><bean:message key="softwareedit.jsp.repos" />:</th> <td> - <c:if test = "${not empty kickstartSoftwareForm.map.possibleRepos}"> + <c:forEach items="${kickstartSoftwareForm.map.possibleRepos}" var="item"> <html:multibox property="selectedRepos" disabled="${item.disabled}"> ${item.value} @@ -112,10 +113,10 @@ function reloadForm(ctl) { ${item.label} <br /> </c:forEach> - </c:if><br/><rhn:tooltip key="softwareedit.jsp.repos-tooltip"/> + <br/><rhn:tooltip key="softwareedit.jsp.repos-tooltip"/> </td> </tr> - + </c:if> <tr> <td align="right" colspan="2">html:submit<bean:message key="kickstartdetails.jsp.updatekickstart"/></html:submit></td> </tr>
commit 3c0955251af6e6f38136b0ea3d55d507ba79c27e Author: Mike McCune mmccune@gibson.pdx.redhat.com Date: Tue Jun 30 11:44:03 2009 -0700
508790 - use virbr0 for KVM guest defaults
diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/code/src/com/redhat/rhn/common/conf/Config.java index ad40462..5106870 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -794,6 +794,16 @@ public class Config { public String getDefaultXenVirtBridge() { return getString(VIRT_BRIDGE, "xenbr0"); } + + /** + * Returns the default value for the xen virt bridge + * @return the value for virt bridge. + */ + public String getDefaultKVMVirtBridge() { + return getString(VIRT_BRIDGE, "virbr0"); + } + + /** * Returns the default virt disk size in GBs * @return the virt disk size diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java index b1d4c91..88feacc 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java @@ -1483,4 +1483,19 @@ public class KickstartData { this.kickstartType = kickstartTypeIn; }
+ /** + * Get the default virt bridge for this KickstartData object. + * + * @return String virt bridge (xenbr0, virbr0) + */ + public String getDefaultVirtBridge() { + if (this.getKickstartDefaults().getVirtualizationType().getLabel() + .equals(KickstartVirtualizationType.KVM_FULLYVIRT)) { + return Config.get().getDefaultKVMVirtBridge(); + } + else { + return Config.get().getDefaultXenVirtBridge(); + } + } + } diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java index a75cbc3..317055d 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java @@ -757,4 +757,17 @@ public class KickstartDataTest extends BaseTestCaseWithUser { assertTrue(k.isRhel5OrGreater()); assertFalse(k.isRhel5()); } + + public void testDefaultBridge() throws Exception { + KickstartData k = createKickstartWithChannel(user.getOrg()); + k.getKickstartDefaults(). + setVirtualizationType(KickstartVirtualizationType.kvmGuest()); + + assertTrue(k.getDefaultVirtBridge().equals(Config.get().getDefaultKVMVirtBridge())); + + k.getKickstartDefaults(). + setVirtualizationType(KickstartVirtualizationType.xenPV()); + + assertTrue(k.getDefaultVirtBridge().equals(Config.get().getDefaultXenVirtBridge())); + } } 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 1e65b36..e2fb148 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 @@ -152,14 +152,14 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction { if (!type.equals(KickstartVirtualizationType.paraHost()) && !type.equals(KickstartVirtualizationType.none())) { if (prof == null) { - form.set(VIRT_BRIDGE, Config.get().getDefaultXenVirtBridge()); + form.set(VIRT_BRIDGE, data.getDefaultVirtBridge()); form.set(VIRT_CPU, Config.get().getDefaultVirtCpus()); form.set(VIRT_DISK_SIZE, Config.get().getDefaultVirtDiskSize()); form.set(VIRT_MEMORY, Config.get().getDefaultVirtMemorySize()); } else { setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge(), - Config.get().getDefaultXenVirtBridge()); + data.getDefaultVirtBridge()); setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), Config.get().getDefaultVirtCpus()); setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFileSize(), diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java index 510967c..6f52d29 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java @@ -75,7 +75,7 @@ public class CobblerProfileCreateCommand extends CobblerProfileCommand { meta.put("org", ksData.getOrg().getId().toString()); prof.setKsMeta(meta); KickstartFactory.saveKickstartData(this.ksData); - prof.setVirtBridge(Config.get().getDefaultXenVirtBridge()); + prof.setVirtBridge(this.ksData.getDefaultVirtBridge()); prof.setVirtCpus(Config.get().getDefaultVirtCpus()); prof.setVirtRam(Config.get().getDefaultVirtMemorySize()); prof.setVirtFileSize(Config.get().getDefaultVirtDiskSize());
commit 1f2d364188f760587962e6b39f041e0cd5f5e962 Author: Partha Aji paji@redhat.com Date: Tue Jun 30 14:06:22 2009 -0400
508705 - Fixed KS details page to hide virt options if virt type is none
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 93f74ef..1e65b36 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 @@ -146,29 +146,29 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction { form.set(KERNEL_OPTIONS, prof.getKernelOptionsString()); form.set(POST_KERNEL_OPTIONS, prof.getKernelPostOptionsString()); } - - if (prof == null) { - form.set(VIRT_BRIDGE, Config.get().getDefaultXenVirtBridge()); - form.set(VIRT_CPU, Config.get().getDefaultVirtCpus()); - form.set(VIRT_DISK_SIZE, Config.get().getDefaultVirtDiskSize()); - form.set(VIRT_MEMORY, Config.get().getDefaultVirtMemorySize()); - } - else { - setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge(), - Config.get().getDefaultXenVirtBridge()); - setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), - Config.get().getDefaultVirtCpus()); - setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFileSize(), - Config.get().getDefaultVirtDiskSize()); - setFormValueOrDefault(form, VIRT_MEMORY, prof.getVirtRam(), - Config.get().getDefaultVirtMemorySize()); - } - - - //Should we show virt options? - ctx.getRequest().setAttribute(IS_VIRT, !data.getKickstartDefaults(). - getVirtualizationType().equals(KickstartFactory.VIRT_TYPE_PV_HOST)); - + KickstartVirtualizationType type = data.getKickstartDefaults(). + getVirtualizationType(); + //Should we show virt options? + if (!type.equals(KickstartVirtualizationType.paraHost()) && + !type.equals(KickstartVirtualizationType.none())) { + if (prof == null) { + form.set(VIRT_BRIDGE, Config.get().getDefaultXenVirtBridge()); + form.set(VIRT_CPU, Config.get().getDefaultVirtCpus()); + form.set(VIRT_DISK_SIZE, Config.get().getDefaultVirtDiskSize()); + form.set(VIRT_MEMORY, Config.get().getDefaultVirtMemorySize()); + } + else { + setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge(), + Config.get().getDefaultXenVirtBridge()); + setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), + Config.get().getDefaultVirtCpus()); + setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFileSize(), + Config.get().getDefaultVirtDiskSize()); + setFormValueOrDefault(form, VIRT_MEMORY, prof.getVirtRam(), + Config.get().getDefaultVirtMemorySize()); + } + ctx.getRequest().setAttribute(IS_VIRT, Boolean.TRUE); + } }
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf index 571b990..e290a04 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/advanced/details.jspf @@ -30,18 +30,8 @@
</td> </tr> - <tr> - <th><bean:message key="kickstart.jsp.create.wizard.virtualization.label" /></th> - <td colspan="2" align="left"> - <html:select property="virtualizationTypeLabel"> - <html:optionsCollection property="virtualizationTypes" label="formattedName" value="label" /> - </html:select> - </td> - </tr> - - <c:if test="${is_virt}"> - <%@ include file="/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf" %> - </c:if> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf" %> +
<c:if test="${empty requestScope.create}"> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf index cbcb96d..93506eb 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf @@ -1,7 +1,15 @@ - - - - + <tr> + <th><bean:message key="kickstartdetails.jsp.virtualization_type" /></th> + <td colspan="2" align="left"> + <html:select property="virtualizationTypeLabel" onchange="this.form.submit();return true;"> + <html:optionsCollection property="virtualizationTypes" label="formattedName" value="label"/> + </html:select><br/> + <c:if test="${not ksdata.rawData}"> + <span class="small-text"><bean:message key="kickstartdetails.jsp.virtTypeChangeWarning" arg0="${ksdata.id}"/></span> + </c:if> + </td> + </tr> +<c:if test="${not empty requestScope.is_virt}"> <tr> <th><bean:message key="kickstartdetails.jsp.virt_mem_mb"/>:</th> <td><html:text property="virt_mem_mb" size="10" /></td> @@ -19,5 +27,6 @@ <tr> <th><bean:message key="kickstartdetails.jsp.virt_bridge"/>:</th> <td><html:text property="virt_bridge" size="10" /></td> - </tr> - \ No newline at end of file + </tr> + +</c:if> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp index ccab725..eca73ce 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/kickstartdetails.jsp @@ -32,20 +32,9 @@ <td><strong><c:out value="${ksdata.kickstartDefaults.kstree.channel.name}"/></strong> <a href="/rhn/kickstart/KickstartSoftwareEdit.do?ksid=${ksdata.id}">(<bean:message key="kickstartdetails.jsp.changeos"/>)</a></td> </tr> - <tr> - <th><bean:message key="kickstartdetails.jsp.virtualization_type" /></th> - <td colspan="2" align="left"> - <html:select property="virtualizationTypeLabel"> - <html:optionsCollection property="virtualizationTypes" label="formattedName" value="label" /> - </html:select><br/> - <span class="small-text"><bean:message key="kickstartdetails.jsp.virtTypeChangeWarning" arg0="${ksdata.id}"/></span> - </td> - </tr> -
- <c:if test="${is_virt}"> - <%@ include file="/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf" %> - </c:if> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/virtoptions.jspf" %> +
commit d2e47011c1a26a58ee2fefa24d2edd40472cdc57 Author: Pradeep Kilambi pkilambi@redhat.com Date: Tue Jun 30 12:46:08 2009 -0400
506264 - check the query for null as well along with inequality.
diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py index 1c0ba13..b31aa7c 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -1128,11 +1128,15 @@ class Backend: channel['channel_product_beta'] = channel['product_beta'] channel['channel_product_id'] = self.lookupChannelProduct(channel)
+ if not channel['channel_product_id']: + # If no channel product dont update + return statement = self.dbmodule.prepare(""" UPDATE rhnChannel SET channel_product_id = :channel_product_id WHERE id = :id - AND channel_product_id <> :channel_product_id + AND (channel_product_id is NULL + OR channel_product_id <> :channel_product_id) """)
statement.execute(id = channel.id,
commit b5aa175bcaae5abca0f60bbdfa46fac2b053d02e Author: Partha Aji paji@redhat.com Date: Tue Jun 30 12:30:37 2009 -0400
508885 - fixed ks schedule pages to remember proxy host
Also fixed forgotten values such as postKernelParams
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf index 806895f..1c415bd 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf @@ -2,7 +2,50 @@ <%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> + <!--Store form variables obtained from previous page --> + <input type="hidden" name="targetProfileType" value="${form.targetProfileType}"/> + <input type="hidden" name="targetProfile" value="${form.targetProfile}" />
+ <input type="hidden" name="postKernelParamsType" value="${form.postKernelParamsType}" /> + <input type="hidden" name="postKernelParams" value="${form.postKernelParams}" /> + <input type="hidden" name="kernelParamsType" value="${form.kernelParamsType}" /> + <input type="hidden" name="kernelParams" value="${form.kernelParams}" /> + + <!-- Store useful id fields--> + <input type="hidden" name="wizardStep" value="first" id="wizard-step" /> + <input type="hidden" name="cobbler_id" value="${form.cobbler_id}" id="cobbler_id" /> + <input type="hidden" name="sid" value="${form.sid}" /> + + <c:if test="${empty regularKS}"> + <!-- Store guest provisioning info --> + <input type="hidden" name="memoryAllocation" value="${form.memoryAllocation}" /> + <input type="hidden" name="virtualCpus" value="${form.virtualCpus}" /> + <input type="hidden" name="localStorageMegabytes" value="${form.localStorageMegabytes}" /> + <input type="hidden" name="diskPath" value="${form.diskPath}" /> + </c:if> + + <c:if test="${requestScope.hasProxies == 'true'}"> + <h2> + <img src="/img/rhn-icon-proxy.gif" + alt="<bean:message key='system.common.proxyAlt' />" /> + <bean:message key="kickstart.schedule.heading.proxy.jsp"/> + </h2> + <p> + <bean:message key="kickstart.schedule.msg.proxy.jsp"/> + </p> + <p> + <select name="proxyHost"> + <c:forEach var="proxy" items="${proxies}"> + <option + <c:if test="${proxy.value == param.proxyHost}">selected="selected"</c:if> + value='${proxy.value}'>${proxy.label}</option> + </c:forEach> + </select> + <br /> + <bean:message key="kickstart.schedule.tip.proxy.jsp"/> + </p> + </c:if> + <c:if test="${requestScope.hasProfiles == 'true'}"> <h2> <img src="/img/rhn-icon-schedule.gif" alt="<bean:message key='system.common.scheduleAlt' />" /> @@ -31,4 +74,18 @@ </td> </tr> </table> - <hr /> \ No newline at end of file + <hr /> + <table width="100%"> + <tr> + <td align="right"> + <c:if test="${not empty regularKS}"> + <input type="button" + value="<bean:message key="kickstart.schedule.button0.jsp" />" + onclick="setStep('fourth');this.form.submit();" /> + </c:if> + <input type="button" value="<bean:message key="kickstart.schedule.button1.jsp" />" onclick="setStep('second');this.form.submit();" /> + <input type="button" value="<bean:message key="kickstart.schedule.button2.jsp" />" onclick="setStep('third');this.form.submit();" /> + </td> + </tr> + </table> + </c:if> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp index e7afbe1..e824a80 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp @@ -58,19 +58,6 @@ function setStep(stepName) { <c:set var="form" value="${kickstartScheduleWizardForm.map}"/>
<rl:listset name="wizard-form"> - <!--Store form variables obtained from previous page --> - <input type="hidden" name="targetProfileType" value="${form.targetProfileType}"/> - <input type="hidden" name="targetProfile" value="${form.targetProfile}" /> - - <input type="hidden" name="postKernelParamsType" value="${form.postKernelParamsType}" /> - <input type="hidden" name="postKernelParams" value="${form.postKernelParams}" /> - <input type="hidden" name="kernelParamsType" value="${form.kernelParamsType}" /> - <input type="hidden" name="kernelParams" value="${form.kernelParams}" /> - - <!-- Store useful id fields--> - <input type="hidden" name="wizardStep" value="first" id="wizard-step" /> - <input type="hidden" name="cobbler_id" value="${form.cobbler_id}" id="cobbler_id" /> - <input type="hidden" name="sid" value="${form.sid}" /> <rl:list width="100%" emptykey = "kickstart.schedule.no.profiles.jsp" alphabarcolumn="label"> <rl:decorator name = "PageSizeDecorator"/> <rl:radiocolumn value="${current.cobblerId}" styleclass="first-column"/> @@ -95,38 +82,8 @@ function setStep(stepName) { </rl:column> </rl:list> rhn:tooltip* - <bean:message key="kickstart.distro.cobbler-only.tooltip"/></rhn:tooltip> - <c:if test="${requestScope.hasProxies == 'true'}"> - <h2> - <img src="/img/rhn-icon-proxy.gif" - alt="<bean:message key='system.common.proxyAlt' />" /> - <bean:message key="kickstart.schedule.heading.proxy.jsp"/> - </h2> - <p> - <bean:message key="kickstart.schedule.msg.proxy.jsp"/> - </p> - <p> - <select name="proxyHost"> - <c:forEach var="proxy" items="${proxies}"> - <option <c:if test="${proxy.value eq proxyHost}">selected="selected"</c:if> value='${proxy.value}'>${proxy.label}</option> - </c:forEach> - </select> - <br /> - <bean:message key="kickstart.schedule.tip.proxy.jsp"/> - </p> - </c:if> - <c:if test="${requestScope.hasProfiles == 'true'}"> - <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf" %> - - <table width="100%"> - <tr> - <td align="right"> - <input type="button" value="<bean:message key="kickstart.schedule.button0.jsp" />" onclick="setStep('fourth');this.form.submit();" /> - <input type="button" value="<bean:message key="kickstart.schedule.button1.jsp" />" onclick="setStep('second');this.form.submit();" /> - <input type="button" value="<bean:message key="kickstart.schedule.button2.jsp" />" onclick="setStep('third');this.form.submit();" /> - </td> - </tr> - </table> - </c:if> + <c:set var="regularKS" value="true"/> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf" %> </rl:listset> </div> </c:if> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp index e9a7323..ab2a6c4 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp @@ -31,20 +31,6 @@ function setStep(stepName) { <div> <c:set var="form" value="${kickstartScheduleWizardForm.map}"/> <rl:listset name="wizard-form"> - <!--Store form variables obtained from previous page --> - <input type="hidden" name="targetProfileType" value="${form.targetProfileType}"/> - <input type="hidden" name="targetProfile" value="${form.targetProfile}" /> - <input type="hidden" name="kernelParams" value="${form.kernelParams}" /> - <input type="hidden" name="memoryAllocation" value="${form.memoryAllocation}" /> - <input type="hidden" name="virtualCpus" value="${form.virtualCpus}" /> - <input type="hidden" name="localStorageMegabytes" value="${form.localStorageMegabytes}" /> - <input type="hidden" name="diskPath" value="${form.diskPath}" /> - - <!-- Store useful id fields--> - <input type="hidden" name="wizardStep" value="first" id="wizard-step" /> - <input type="hidden" name="cobbler_id" value="${form.cobbler_id}" id="cobbler_id" /> - <input type="hidden" name="sid" value="${form.sid}" /> - <rl:list width="100%" emptykey = "virtualization.provision.first.jsp.no.profiles" alphabarcolumn="label"> <rl:decorator name = "PageSizeDecorator"/> <rl:radiocolumn value="${current.cobblerId}" styleclass="first-column"/> @@ -59,8 +45,6 @@ function setStep(stepName) { </rl:list> <h2><bean:message key="virtualization.provision.first.jsp.header2" /></h2> - - <table class="details"> <tr> <th><rhn:required-field key="virtualization.provision.first.jsp.guest_name.header"/></th> @@ -78,37 +62,9 @@ function setStep(stepName) { <bean:message key="virtualization.provision.override.jsp.goto.advanced.options" arg0="${rhn:localize('kickstart.schedule.button1.jsp')}"/> <br/><br/> - - <c:if test="${requestScope.hasProxies == 'true'}"> - <h2><img src="/img/rhn-icon-proxy.gif"/><bean:message key="kickstart.schedule.heading.proxy.jsp"/></h2> - <p> - <bean:message key="kickstart.schedule.msg.proxy.jsp"/> - </p> - <p> - <select name="proxyHost"> - <c:forEach var="proxy" items="${proxies}"> - <option <c:if test="${proxy.value eq proxyHost}">selected="selected"</c:if> value='${proxy.value}'>${proxy.label}</option> - </c:forEach> - </select> - <br /> - <bean:message key="kickstart.schedule.tip.proxy.jsp"/> - </p> - </c:if> - <c:if test="${requestScope.hasProfiles == 'true'}"> - <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf" %> - <table width="100%"> - <tr> - <td align="right"> - <input type="button" value="<bean:message key="kickstart.schedule.button1.jsp" />" onclick="setStep('second');this.form.submit();" /> - <input type="button" value="<bean:message key="kickstart.schedule.button2.jsp" />" onclick="setStep('third');this.form.submit();" /> - </td> - </tr> - </table> - </c:if> - </div> +<%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf" %> </rl:listset> </div>
</body> </html> -
commit 4ebf9a50ed9a534226961db3a4402ed443860961 Author: Miroslav Suchý msuchy@redhat.com Date: Tue Jun 30 13:45:37 2009 +0200
Automatic commit of package [spacewalk-branding] release [0.6.7-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index f4bb8bb..eb017b7 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -1,5 +1,5 @@ Name: spacewalk-branding -Version: 0.6.6 +Version: 0.6.7 Release: 1%{?dist} Summary: Spacewalk branding data
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
%changelog +* Tue Jun 30 2009 Miroslav Suchy msuchy@redhat.com 0.6.7-1 +- 508710 - make bar on top of page wider, so we do not get empty space on wider displays + * Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.6-1 - 506489 - remove the link associated with the org name present in the UI header (bbuckingham@redhat.com) diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index ed657c3..660ed0e 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -0.6.6-1 branding/ +0.6.7-1 branding/
commit 4ec8b88442ab9238427b480e553852c3543d2fa6 Author: Miroslav Suchý msuchy@redhat.com Date: Tue Jun 30 13:43:34 2009 +0200
508710 - make bar on top of page wider, so we do not get empty space on wider displays
diff --git a/branding/img/nav/utilBkgdRight.png b/branding/img/nav/utilBkgdRight.png index aa2043c..78ac2e4 100644 Binary files a/branding/img/nav/utilBkgdRight.png and b/branding/img/nav/utilBkgdRight.png differ
commit a3f11584b0543c25b4b5b7bce8d222562c2023ce Author: Partha Aji paji@redhat.com Date: Mon Jun 29 22:28:59 2009 -0400
Made the radio button in schedule ks page choose scheduleAsap by default
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf new file mode 100644 index 0000000..806895f --- /dev/null +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf @@ -0,0 +1,34 @@ +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> + + <h2> + <img src="/img/rhn-icon-schedule.gif" + alt="<bean:message key='system.common.scheduleAlt' />" /> + <bean:message key="kickstart.schedule.heading3.jsp" /> + </h2> + <c:choose> + <c:when test="${empty param.scheduleAsap or param.scheduleAsap == 'true'}"> + <c:set var="byAsap" value="checked="checked""/> + <c:set var="byDate" value=""/> + </c:when> + <c:otherwise> + <c:set var="byDate" value="checked="checked""/> + <c:set var="byAsap" value=""/> + </c:otherwise> + </c:choose> + + <table width="50%"> + <tr> + <td><input type="radio" name="scheduleAsap" value="true" id="scheduleAsap" ${byAsap} /><bean:message key="kickstart.schedule.heading3.option1.jsp" /></td> + </tr> + <tr> + <td><input type="radio" name="scheduleAsap" value="false" id="scheduleDate" ${byDate} /><bean:message key="kickstart.schedule.heading3.option2.jsp" /><br /><br /> + <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> + <jsp:param name="widget" value="date"/> + </jsp:include> + </td> + </tr> + </table> + <hr /> \ No newline at end of file diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp index 6c05b7d..e7afbe1 100644 --- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp +++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp @@ -115,24 +115,8 @@ function setStep(stepName) { </p> </c:if> <c:if test="${requestScope.hasProfiles == 'true'}"> - <h2> - <img src="/img/rhn-icon-schedule.gif" - alt="<bean:message key='system.common.scheduleAlt' />" /> - <bean:message key="kickstart.schedule.heading3.jsp" /> - </h2> - <table width="50%"> - <tr> - <td><input type="radio" name="scheduleAsap" value="true" id="scheduleAsap"/><bean:message key="kickstart.schedule.heading3.option1.jsp" /></td> - </tr> - <tr> - <td><input type="radio" name="scheduleAsap" value="false" id="scheduleDate" /><bean:message key="kickstart.schedule.heading3.option2.jsp" /><br /><br /> - <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> - <jsp:param name="widget" value="date"/> - </jsp:include> - </td> - </tr> - </table> - <hr /> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf" %> + <table width="100%"> <tr> <td align="right"> diff --git a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp index e261f1d..e9a7323 100644 --- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp @@ -94,21 +94,8 @@ function setStep(stepName) { <bean:message key="kickstart.schedule.tip.proxy.jsp"/> </p> </c:if> - <c:if test="${requestScope.hasProfiles == 'true'}"> - <h2><img src="/img/rhn-icon-schedule.gif" /><bean:message key="kickstart.schedule.heading3.jsp" /></h2> - <table width="50%"> - <tr> - <td><input type="radio" name="scheduleAsap" value="true" id="scheduleAsap"/><bean:message key="kickstart.schedule.heading3.option1.jsp" /></td> - </tr> - <tr> - <td><input type="radio" name="scheduleAsap" value="false" id="scheduleDate" /><bean:message key="kickstart.schedule.heading3.option2.jsp" /><br /><br /> - <jsp:include page="/WEB-INF/pages/common/fragments/date-picker.jsp"> - <jsp:param name="widget" value="date"/> - </jsp:include> - </td> - </tr> - </table> - <hr /> + <c:if test="${requestScope.hasProfiles == 'true'}"> + <%@ include file="/WEB-INF/pages/common/fragments/kickstart/schedule/schedule-options.jspf" %> <table width="100%"> <tr> <td align="right">
commit 4b80c5d58eea761e92eeaf7df4a5ee7238d35db0 Author: Partha Aji paji@redhat.com Date: Mon Jun 29 18:03:07 2009 -0400
508376 - fix for a typo in the previous commit
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 22e3f09..206f021 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -203,7 +203,7 @@ install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar $RPM_BUILD_ROOT/%{_datad install -m 644 conf/log4j.properties.taskomatic $RPM_BUILD_ROOT/%{_datadir}/rhn/classes/log4j.properties ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT/%{_bindir}/taskomaticd ln -s -f %{_javadir}/ojdbc14.jar $RPM_BUILD_ROOT%{jardir}/ojdbc14.jar -mkdir -p $RPM_BUILD_ROOT/%{realcobsnippetsdir} +install -d -m 755 $RPM_BUILD_ROOT/%{realcobsnippetsdir} ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT/%{realcobsnippetsdir}/spacewalk
%clean @@ -497,7 +497,6 @@ fi code had been ripped out, so i converted it to java (jsherril@redhat.com) - 491361 - Added note to error messages to check the log for error messages. (jason.dobies@redhat.com) - 500891 - fixed an unescaped string on snippets delete confirm page (paji@redhat.com) -dually.rdu.redhat.com,10.11.228.46 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAt3L3QI0h+nKNrRIrd/Qj/l2aaPAtSk1O7smalVJZYLx8JCwmYLd+XzWc9b951l6zevxMIHfHRFjA2EwoJWKVzffNE/91RVs9jQ3M5289YX5VZbu6g/9PZ6gj5JG7EN+Q6h29iDhJ/LBrZb62ytXru+jBGMcoBoZggQ+nAtjZstZcOwlIOZ0ldLMJycsWV2aKXwhbVgowtE/evPuF+lF68Z4Fdfi/ScznuF7mQlHAnxQNEQCQojjqf37fgW8dQENIxoaFOJXOFjeW57X2HIgz0XX3ux3kgtGgmKvQanVRpISnUBnlEEXtDvYxO73mlTen+eS+wbyhF0Wkpg3OEWaTOQ== - 500887 -Fix to not escape contents in cobbler snippet detials page (paji@redhat.com) - 5/14 update of webui translation strings (shughes@redhat.com) - 500727 - Just noticed this was flagged as NOTABUG since we don't want to
commit c98efa074c95300f32c21172abf9a40148eb3f07 Author: Mike McCune mmccune@gibson.pdx.redhat.com Date: Mon Jun 29 14:51:37 2009 -0700
removing spammy debug from log4j properties file
diff --git a/java/code/src/log4j.properties b/java/code/src/log4j.properties index d2f0275..de268b7 100644 --- a/java/code/src/log4j.properties +++ b/java/code/src/log4j.properties @@ -40,8 +40,5 @@ log4j.logger.com.redhat.rhn.taskomatic.SchedulerKernel=INFO #log4j.logger.net.rkbloom.logdriver.LogCallableStatement=DEBUG #log4j.logger.net.rkbloom.logdriver.LogConnection=DEBUG,HibernateAppender
-log4j.logger.org.cobbler.CobblerConnection=DEBUG -log4j.logger.com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper=DEBUG - # General debug for everything. Very noisy #log4j.logger.com.redhat.rhn=DEBUG
commit f221ed3961b8e98dc2ec1089e0cb1e07837c8cc1 Author: Partha Aji paji@redhat.com Date: Mon Jun 29 15:57:40 2009 -0400
508736 - Corrected spec to properly set the cobbler/snippets/spacewalk symlink
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 4a19631..22e3f09 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -3,6 +3,7 @@ %define cobprofdirup %{_localstatedir}/lib/rhn/kickstarts/upload %define cobprofdirwiz %{_localstatedir}/lib/rhn/kickstarts/wizard %define cobdirsnippets %{_localstatedir}/lib/rhn/kickstarts/snippets +%define realcobsnippetsdir %{_localstatedir}/lib/cobbler/snippets %define appdir %{_localstatedir}/lib/tomcat5/webapps %define jardir %{_localstatedir}/lib/tomcat5/webapps/rhn/WEB-INF/lib %define jars antlr asm bcel c3p0 cglib commons-beanutils commons-cli commons-codec commons-digester commons-discovery commons-el commons-io commons-fileupload commons-lang commons-logging commons-validator concurrent dom4j hibernate3 jaf jasper5-compiler jasper5-runtime javamail jcommon jdom jfreechart jspapi jpam log4j redstone-xmlrpc redstone-xmlrpc-client ojdbc14 oro oscache sitemesh struts taglibs-core taglibs-standard xalan-j2 xerces-j2 xml-commons-apis commons-collections @@ -202,16 +203,14 @@ install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar $RPM_BUILD_ROOT/%{_datad install -m 644 conf/log4j.properties.taskomatic $RPM_BUILD_ROOT/%{_datadir}/rhn/classes/log4j.properties ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT/%{_bindir}/taskomaticd ln -s -f %{_javadir}/ojdbc14.jar $RPM_BUILD_ROOT%{jardir}/ojdbc14.jar - +mkdir -p $RPM_BUILD_ROOT/%{realcobsnippetsdir} +ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT/%{realcobsnippetsdir}/spacewalk
%clean rm -rf $RPM_BUILD_ROOT
-%postun -rm -f /var/lib/cobbler/snippets/spacewalk - -%post -ln -s -f %{cobdirsnippets} /var/lib/cobbler/snippets/spacewalk +%pre +rm -f %{realcobsnippetsdir}/spacewalk
%post -n spacewalk-taskomatic # This adds the proper /etc/rc*.d links for the script @@ -232,6 +231,7 @@ fi %dir %{cobdirsnippets} %{appdir}/* %config(noreplace) %{_sysconfdir}/tomcat5/Catalina/localhost/rhn.xml +%{realcobsnippetsdir}/spacewalk
%files -n spacewalk-taskomatic %attr(755, root, root) %{_initrddir}/taskomatic @@ -497,6 +497,7 @@ fi code had been ripped out, so i converted it to java (jsherril@redhat.com) - 491361 - Added note to error messages to check the log for error messages. (jason.dobies@redhat.com) - 500891 - fixed an unescaped string on snippets delete confirm page (paji@redhat.com) +dually.rdu.redhat.com,10.11.228.46 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAt3L3QI0h+nKNrRIrd/Qj/l2aaPAtSk1O7smalVJZYLx8JCwmYLd+XzWc9b951l6zevxMIHfHRFjA2EwoJWKVzffNE/91RVs9jQ3M5289YX5VZbu6g/9PZ6gj5JG7EN+Q6h29iDhJ/LBrZb62ytXru+jBGMcoBoZggQ+nAtjZstZcOwlIOZ0ldLMJycsWV2aKXwhbVgowtE/evPuF+lF68Z4Fdfi/ScznuF7mQlHAnxQNEQCQojjqf37fgW8dQENIxoaFOJXOFjeW57X2HIgz0XX3ux3kgtGgmKvQanVRpISnUBnlEEXtDvYxO73mlTen+eS+wbyhF0Wkpg3OEWaTOQ== - 500887 -Fix to not escape contents in cobbler snippet detials page (paji@redhat.com) - 5/14 update of webui translation strings (shughes@redhat.com) - 500727 - Just noticed this was flagged as NOTABUG since we don't want to
commit 3bc4c571c889c85bd038a06f08bed865f3aeff0f Author: Brad Buckingham bbuckingham@redhat.com Date: Fri Jun 26 17:44:11 2009 -0400
508141 - api - system.config.deployAll updated w/ better exception when system not config capable
Updated the logic of the deployAll api to provide an error message consistent with what the UI provides when the user attempts to deploy config files to a system that is not capable of deploying files to. E.g. system doesn't have tools channel and rhncfg* packages installed.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 8db5c8a..a1d65ac 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -7676,7 +7676,10 @@ Follow this url to see the full list of inactive systems: <source>Invalid profile label specified: {0}</source> </trans-unit>
- + <trans-unit id="api.system.missingCapabilities"> + <source>The server {0} does not have the {1} client capability. Please enable the capability before proceeding with the operation.</source> + </trans-unit> + <trans-unit id="api.systemgroup.serverNotInGroup"> <source>The specified server is not a member of the specified group</source> </trans-unit> diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java index 78ce5a9..ad7a01a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.xmlrpc;
import com.redhat.rhn.FaultException; +import com.redhat.rhn.domain.server.Server;
/** * MissingCapabilityException @@ -40,4 +41,13 @@ public class MissingCapabilityException extends FaultException { super(2401, "missingCapability" , "Missing capability"); }
+ /** + * Constructor for exception on missing capability on a server. + * @param missingCapability the missing capability. + * @param incapableServer the server missing the capability + */ + public MissingCapabilityException(String missingCapability, Server incapableServer) { + super(2401, "missingCapability", "api.system.missingCapabilities", + new Object[] {incapableServer.getHostname(), missingCapability}); + } } diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java index 886d8fc..cc738de 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java @@ -37,6 +37,7 @@ import com.redhat.rhn.frontend.xmlrpc.BaseHandler; import com.redhat.rhn.frontend.xmlrpc.configchannel.XmlRpcConfigChannelHelper; import com.redhat.rhn.frontend.xmlrpc.serializer.ConfigFileNameDtoSerializer; import com.redhat.rhn.frontend.xmlrpc.system.XmlRpcSystemHelper; +import com.redhat.rhn.manager.MissingCapabilityException; import com.redhat.rhn.manager.configuration.ConfigurationManager;
@@ -318,7 +319,13 @@ public class ServerConfigHandler extends BaseHandler { servers.add(helper.lookupServer(loggedInUser, sid)); } ConfigurationManager manager = ConfigurationManager.getInstance(); - manager.deployConfiguration(loggedInUser, servers, date); + try { + manager.deployConfiguration(loggedInUser, servers, date); + } + catch (MissingCapabilityException e) { + throw new com.redhat.rhn.frontend.xmlrpc.MissingCapabilityException( + e.getCapability(), e.getServer()); + } return 1; }
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java index 6559418..5510057 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java @@ -73,9 +73,7 @@ public class ServerConfigHandlerTest extends BaseHandlerTestCase { // gcc1 only Server srv1 = ServerFactoryTest.createTestServer(regular, true, ServerConstants.getServerGroupTypeProvisioningEntitled()); - SystemManagerTest.giveCapability(srv1.getId(), - SystemManager.CAP_CONFIGFILES_DEPLOY, ver); - + srv1.subscribe(gcc1); srv1.subscribe(gcc2);
@@ -108,7 +106,22 @@ public class ServerConfigHandlerTest extends BaseHandlerTestCase { // System 1 - both g1f1 and g1f2 should deploy here List<Number> systems = new ArrayList<Number>(); systems.add(srv1.getId()); - Date date = new Date(); + Date date = new Date(); + + try { + // validate that system must have config deployment capability + // in order to deploy config files... (e.g. rhncfg* pkgs installed) + handler.deployAll(regularKey, systems, date); + + fail("Shouldn't be permitted to deploy without config deploy capability."); + } + catch (Exception e) { + // Success + } + + SystemManagerTest.giveCapability(srv1.getId(), + SystemManager.CAP_CONFIGFILES_DEPLOY, ver); + handler.deployAll(regularKey, systems, date);
DataResult<ScheduledAction> actions = ActionManager.
commit a4fb92cb3a4b5a7b5761ed5c6cb8a8a36a55d4da Author: Justin Sherrill jsherril@redhat.com Date: Fri Jun 26 12:10:46 2009 -0400
508323 - fixing issue with creating cobbler system records with spaces (which would fail)
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java index 0ad2ca1..e6e3869 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java @@ -298,7 +298,8 @@ public class CobblerSystemCreateCommand extends CobblerCommand { * @return String name of cobbler system record. */ public String getCobblerSystemRecordName() { - return this.server.getName() + ":" + + String name = this.server.getName().replace(' ', '_'); + return name + ":" + this.server.getOrg().getId(); }
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java index 69adcd2..0c265ae 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java @@ -91,7 +91,7 @@ public class CobblerVirtualSystemCommand extends CobblerSystemCreateCommand { */ @Override public String getCobblerSystemRecordName() { - return super.getCobblerSystemRecordName() + ":" + guestName; + return super.getCobblerSystemRecordName() + ":" + guestName.replace(' ', '_'); }
@Override
commit 45de4fb041e8ee07316a38fe2d3a805b6782ca09 Author: Shannon Hughes shughes@redhat.com Date: Fri Jun 26 09:38:16 2009 -0400
508220 - fixed channel sharing syntax error on english side
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 521532d..7527dd8 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 @@ -11555,7 +11555,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro </trans-unit>
<trans-unit id="channels.shared.jsp.header1"> - <source>The software channels listed below my be shared by your organization.</source> + <source>The software channels listed below may be shared by your organization.</source> </trans-unit>
<trans-unit id="channels.custom.jsp.header1">
commit e39a8035a199da3ed34d48c922aa9ca622afecd4 Author: Devan Goodwin dgoodwin@redhat.com Date: Fri Jun 26 10:21:46 2009 -0300
Fix API call to remove server custom data value.
Looks like this was being hidden by our recently removed hibernate exception hiding.
At least in this test, deleting a custom data value from a server was getting re-saved as the object wasn't actually deleted from it's association with the server. Seems likely this would be a problem for actual API use as well.
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java index 115db94..4df50ef 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Server.java +++ b/java/code/src/com/redhat/rhn/domain/server/Server.java @@ -92,7 +92,7 @@ public class Server extends BaseDomainHelper implements Identifiable { private Ram ram; private Dmi dmi; private Set networkInterfaces; - private Set customDataValues; + private Set<CustomDataValue> customDataValues; private Set channels; private List configChannels = Collections.EMPTY_LIST; private Set localChannels = new HashSet(); @@ -994,7 +994,7 @@ public class Server extends BaseDomainHelper implements Identifiable { /** * @return Returns the customDataValues. */ - public Set getCustomDataValues() { + public Set<CustomDataValue> getCustomDataValues() { return customDataValues; }
diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java index 2ac9d88..d265624 100644 --- a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java +++ b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java @@ -95,6 +95,7 @@ public class ServerFactory extends HibernateFactory { */ public static void removeCustomDataValue(Server server, CustomDataKey key) { CustomDataValue value = server.getCustomDataValue(key); + server.getCustomDataValues().remove(value); if (value != null) { singleton.removeObject(value); }
commit 7b3fefff63f8dc5fb07bb0155b975728cb5d1ae0 Author: Miroslav Suchý msuchy@redhat.com Date: Fri Jun 26 14:54:04 2009 +0200
Automatic commit of package [rhn-client-tools] release [0.6.1-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index 5dc8c60..bdab38e 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/%%7Bname%7D-%%7Bversion%7D.t... URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools -Version: 0.4.28 +Version: 0.6.1 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -204,6 +204,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/rhn_register.desktop
%changelog +* Fri Jun 26 2009 Miroslav Suchy msuchy@redhat.com 0.6.1-1 +- code cleanup - there is no usage of md5 in this code +- bump up version to 0.6 + * Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.4.28-1 - 503090 - Fix missing packages reported during rhnreg_ks. (dgoodwin@redhat.com) diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools index ef7f6d9..645d98f 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -0.4.28-1 client/rhel/rhn-client-tools/ +0.6.1-1 client/rhel/rhn-client-tools/
commit 6e0cf98d4d2a50e8e262dad6dd169aa26be01be4 Author: Miroslav Suchý msuchy@redhat.com Date: Fri Jun 26 14:51:53 2009 +0200
code cleanup - there is no usage of md5 in this code
addressing: /usr/share/rhn/up2date_client/up2dateUtils.py:14: DeprecationWarning: the md5 module is deprecated; use hashlib instead import md5 An error has occurred: <type exceptions.TypeError> See /var/log/up2date for more information
Which happend on F11
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py index 4f1d75c..9ee6198 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateUtils.py @@ -11,7 +11,6 @@ import os import sys import rpm import string -import md5
import up2dateErrors import transaction
commit d4bce1069cd9aab44f6e1720ce4d8c4fa0b3a1f1 Author: Miroslav Suchý msuchy@redhat.com Date: Fri Jun 26 14:40:35 2009 +0200
Automatic commit of package [yum-rhn-plugin] release [0.5.7-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec index 0157c6d..1a0b102 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -1,7 +1,7 @@ Summary: RHN support for yum Name: yum-rhn-plugin Source: %{name}-%{version}.tar.gz -Version: 0.5.6 +Version: 0.5.7 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -60,6 +60,9 @@ make -f Makefile.yum-rhn-plugin install VERSION=%{version}-%{release} PREFIX=$RP
%changelog +* Fri Jun 26 2009 John Matthews jmatthew@redhat.com 0.5.7-1 +- yum-rhn-plugin requires m2crypto + * Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.5.6-1 - yum operations are not getting redirected as the GET requested is formed at the plugin level and not through rhnlib. (pkilambi@redhat.com) diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin index 1544f8d..ef578d7 100644 --- a/rel-eng/packages/yum-rhn-plugin +++ b/rel-eng/packages/yum-rhn-plugin @@ -1 +1 @@ -0.5.6-1 client/rhel/yum-rhn-plugin/ +0.5.7-1 client/rhel/yum-rhn-plugin/
commit 44a483d18aee83e460206ffb3eb8f28e8bf3a5e9 Author: Miroslav Suchý msuchy@redhat.com Date: Fri Jun 26 14:39:22 2009 +0200
yum-rhn-plugin requires m2crypto
addressing: Traceback (most recent call last): File "/usr/lib/yum-plugins/rhnplugin.py", line 43, in <module> from M2Crypto.SSL import SSLError, Connection ImportError: No module named M2Crypto.SSL
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec index a4e6556..0157c6d 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -15,6 +15,7 @@ BuildRequires: gettext
Requires: yum >= 3.0-5.3 Requires: rhn-client-tools >= 0.4.19 +Requires: m2crypto
# Not really, but for upgrades we need these Requires: rhn-setup
commit 8b411f10d7081c04954026fb4a656a4dd89bfadc Author: Miroslav Suchý msuchy@redhat.com Date: Fri Jun 26 11:15:43 2009 +0200
Automatic commit of package [spacewalk-proxy] release [0.6.6-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index 65f9545..e83ca74 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 0.6.5 +Version: 0.6.6 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python @@ -288,6 +288,9 @@ fi
%changelog +* Fri Jun 26 2009 John Matthews jmatthew@redhat.com 0.6.6-1 +- fix build error + * Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.5-1 - change comments to docstrings (msuchy@redhat.com) - change comments to docstrings (msuchy@redhat.com) diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy index c208048..16c29cd 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -0.6.5-1 proxy/proxy/ +0.6.6-1 proxy/proxy/
commit 0a334d1d82426ffd6279777cb03f4eaf67bbd119 Author: Miroslav Suchý msuchy@redhat.com Date: Fri Jun 26 11:15:01 2009 +0200
fix build error
addressing: rhnRepository.py: Error compiling File "rhnRepository.py", line 247 name = nvrea[0]
^ SyntaxError: unindent does not match any outer indentation level
diff --git a/proxy/proxy/broker/rhnRepository.py b/proxy/proxy/broker/rhnRepository.py index 454518d..3daa794 100644 --- a/proxy/proxy/broker/rhnRepository.py +++ b/proxy/proxy/broker/rhnRepository.py @@ -242,8 +242,7 @@ def listPackages(function, channel, version):
def computePackagePath(nvrea, source=0, prepend=""): - """ Finds the appropriate path, prepending something if necessary """ - + """ Finds the appropriate path, prepending something if necessary """ name = nvrea[0] release = nvrea[2]
commit 3861a01016f590d581d47591c24fa50f8119cca5 Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 18:22:34 2009 -0400
ErrataSearch, add "synopsis" to ALL_FIELDS
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 2ea77af..5febc05 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 @@ -559,7 +559,7 @@ public class ErrataSearchAction extends RhnAction { query = escapeSpecialChars(query); return "(description:(" + query + ") topic:(" + query + ") solution:(" + query + ") notes:(" + query + ") product:(" + query + ")" + - " advisoryName:(" + query + "))"; + " advisoryName:(" + query + ") synopsis:(" + query + "))"; } else if (OPT_ADVISORY.equals(mode)) { query = escapeSpecialChars(query);
commit d58966434ef7a5544cc537d41c47fa0c70e11d3d Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 17:54:43 2009 -0400
Automatic commit of package [spacewalk-java] release [0.6.29-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 488976a..4a19631 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -11,7 +11,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.28 +Version: 0.6.29 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -250,7 +250,7 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
%changelog -* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.28-1 +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.29-1 - Remove catch/log return null of HibernateExceptions. (dgoodwin@redhat.com) - Fix server migration when source org has > 1000 org admins. (dgoodwin@redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index bbbd9da..51d3e20 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.28-1 java/ +0.6.29-1 java/
commit 9cdd3b750f36399d1e26bccc95f707dac0fadc5e Author: Brad Buckingham bbuckingham@redhat.com Date: Thu Jun 25 17:56:52 2009 -0400
Automatic commit of package [rhn-virtualization] release [5.4.1-1].
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec index 7407508..fbc0bf5 100644 --- a/client/tools/rhn-virtualization/rhn-virtualization.spec +++ b/client/tools/rhn-virtualization/rhn-virtualization.spec @@ -10,7 +10,7 @@ License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t...
-Version: 5.4.0 +Version: 5.4.1 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -162,6 +162,10 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE
%changelog +* Thu Jun 25 2009 Brad Buckingham bbuckingham@redhat.com 5.4.1-1 +- 470335 - Fixing EOF error when poller tries to pickle dump the data to cache + file. (pkilambi@redhat.com) + * Tue Jun 16 2009 Brad Buckingham bbuckingham@redhat.com 5.4.0-1 - bumping version (bbuckingham@redhat.com) - 502902 - If xend is not running instead of returning an empty list return an diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-virtualization index 87f4c1c..e782bec 100644 --- a/rel-eng/packages/rhn-virtualization +++ b/rel-eng/packages/rhn-virtualization @@ -1 +1 @@ -5.4.0-1 client/tools/rhn-virtualization/ +5.4.1-1 client/tools/rhn-virtualization/
commit d6d62ab7e85e9f23ef690ed6f65be23c9c8e561a Author: Brad Buckingham bbuckingham@redhat.com Date: Thu Jun 25 17:43:02 2009 -0400
508141 - ManageSoftwareChannels - fix broken links for 'delete software channel'
The delete_confirm.pxt has been ported to java; however, there were still several pages pointing to it. Updated those.
Also found that the channel id (cid) was not being saved in the request for ManageSoftwareChannels->channel->Packages; therefore, the delete link on that page was missing the cid value. Updated that as well.
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 93a7c4d..54d782d 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 @@ -35,8 +35,6 @@ import javax.servlet.http.HttpServletResponse; */ public class ChannelPackageMenuAction extends RhnAction {
- - /** {@inheritDoc} */ public ActionForward execute(ActionMapping mapping, ActionForm formIn, @@ -46,7 +44,6 @@ public class ChannelPackageMenuAction extends RhnAction { RequestContext requestContext = new RequestContext(request); User user = requestContext.getLoggedInUser();
- long cid = requestContext.getRequiredParam("cid");
Channel chan = ChannelFactory.lookupByIdAndUser(cid, user); @@ -57,13 +54,8 @@ public class ChannelPackageMenuAction extends RhnAction {
request.setAttribute("channel_name", chan.getName()); request.setAttribute("channel", chan); + request.setAttribute("cid", cid);
return mapping.findForward("default"); - } - - - - - } diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf index 172aa7f..118367c 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/manage_channel_header.jspf @@ -1,7 +1,7 @@ <rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" imgAlt="overview.jsp.alt" helpUrl="/rhn/help/reference/en-US/s1-sm-channels-packages.jsp#s2-sm-channel-manage" - deletionUrl="/network/software/channels/manage/delete_confirm.pxt?cid=${cid}" + deletionUrl="/rhn/channels/manage/Delete.do?cid=${cid}" deletionType="channel"> <bean:message key="channel.edit.jsp.toolbar" arg0="${channel_name}"/> </rhn:toolbar> diff --git a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp index e345a73..a344361 100644 --- a/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp +++ b/java/code/webapp/WEB-INF/pages/multiorg/channels/orglist.jsp @@ -10,7 +10,7 @@ </head> <body> <rhn:toolbar base="h1" img="/img/rhn-icon-channels.gif" - deletionUrl="/network/software/channels/manage/delete_confirm.pxt?cid=${param.cid}" + deletionUrl="/rhn/channels/manage/Delete.do?cid=${param.cid}" deletionAcl="user_role(channel_admin); formvar_exists(cid)" deletionType="software.channel"> <bean:message key="channel.edit.jsp.toolbar" arg0="${channel_name}"/>
commit ed5206ad376404e53d883e1717ce079b6b59c5a4 Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 17:24:37 2009 -0400
Automatic commit of package [spacewalk-java] release [0.6.28-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index e6b5a8e..488976a 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -11,7 +11,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.27 +Version: 0.6.28 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -250,7 +250,7 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
%changelog -* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.27-1 +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.28-1 - Remove catch/log return null of HibernateExceptions. (dgoodwin@redhat.com) - Fix server migration when source org has > 1000 org admins. (dgoodwin@redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 747ed8f..bbbd9da 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.27-1 java/ +0.6.28-1 java/
commit f92688ae0aef79d5682ee26b128bad2b3d5aa2da Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 17:23:43 2009 -0400
Automatic commit of package [spacewalk-backend] release [0.6.15-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 350d207..d9dea5e 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 0.6.14 +Version: 0.6.15 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -568,7 +568,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$ %changelog -* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.14-1 +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.15-1 - change comments to docstrings (msuchy@redhat.com) - change comments to docstrings (msuchy@redhat.com) - change comments to docstrings (msuchy@redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index f4be8cc..65f3b59 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.14-1 backend/ +0.6.15-1 backend/
commit 5b99fc9aa454a8a0d811b13f6bc6ee2ca3b8472c Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 17:22:36 2009 -0400
Automatic commit of package [oracle-server-scripts] minor release [10.2.0-30].
diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/projects/oracle-server-scripts/oracle-server-scripts.spec index 5b7b8c0..0daf81f 100644 --- a/projects/oracle-server-scripts/oracle-server-scripts.spec +++ b/projects/oracle-server-scripts/oracle-server-scripts.spec @@ -9,7 +9,7 @@ Summary: Oracle 10g Database Server Enterprise Edition scripts Name: oracle-server-scripts Version: 10.2.0 -Release: 29%{?dist} +Release: 30%{?dist} Source0: oracle-home.sh Source1: init-params.ora Source2: create-db.sh @@ -99,6 +99,12 @@ exit 0 %{oracle_scripts}
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 10.2.0-30 +- handle existing embedded entries in /etc/oratab during install + (mzazrivec@redhat.com) +- create embedded db entry only if it does not exist (mzazrivec@redhat.com) +- We use 10.2.0.4 embedded db now (mzazrivec@redhat.com) + * Tue Jun 02 2009 Milan Zazrivec mzazrivec@redhat.com 10.2.0-29 - script for 10.2.0.3 to 10.2.0.4 10g upgrade * Thu May 21 2009 jesus m. rodriguez jesusr@redhat.com 10.2.0-28 diff --git a/rel-eng/packages/oracle-server-scripts b/rel-eng/packages/oracle-server-scripts index 5d0334a..b06d5f9 100644 --- a/rel-eng/packages/oracle-server-scripts +++ b/rel-eng/packages/oracle-server-scripts @@ -1 +1 @@ -10.2.0-29 projects/oracle-server-scripts/ +10.2.0-30 projects/oracle-server-scripts/
commit 3c68ee8cf2a526176ace81f0ea24ee7d9a04b9a5 Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 17:18:56 2009 -0400
Automatic commit of package [nocpulse-common] release [2.1.16-1].
diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/nocpulse-common/nocpulse-common.spec index d279b9f..7309672 100644 --- a/monitoring/nocpulse-common/nocpulse-common.spec +++ b/monitoring/nocpulse-common/nocpulse-common.spec @@ -1,5 +1,5 @@ Name: nocpulse-common -Version: 2.1.15 +Version: 2.1.16 Release: 1%{?dist} Summary: NOCpulse common License: GPLv2 @@ -136,6 +136,10 @@ fi rm -rf $RPM_BUILD_ROOT
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 2.1.16-1 +- don't print error when files to be moved don't exist (mzazrivec@redhat.com) +- Don't to migrate log files from /home/nocpulse/var (mzazrivec@redhat.com) + * Tue Jun 16 2009 Miroslav Suchý msuchy@redhat.com 2.1.15-1 - fix problem when nocpulse user do not exist
diff --git a/rel-eng/packages/nocpulse-common b/rel-eng/packages/nocpulse-common index e1088df..e4049bd 100644 --- a/rel-eng/packages/nocpulse-common +++ b/rel-eng/packages/nocpulse-common @@ -1 +1 @@ -2.1.15-1 monitoring/nocpulse-common/ +2.1.16-1 monitoring/nocpulse-common/
commit 253ecb57ad6e9d8923ac6f054886125b0b18c51a Author: Brad Buckingham bbuckingham@redhat.com Date: Thu Jun 25 17:11:48 2009 -0400
507959 - api - channel.software.mergePackages null pointer fix
The serializer used by this API was not checking to see if the provider was null before accessing it thereby generating a null pointer exception...
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java index f21c4a0..66c8ad5 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/PackageSerializer.java @@ -76,9 +76,12 @@ public class PackageSerializer implements XmlRpcCustomSerializer {
String provider = LocalizationService.getInstance().getMessage( "channel.jsp.gpgunknown"); - for (PackageKey key : pack.getPackageKeys()) { - if (key.getType().equals(PackageFactory.PACKAGE_KEY_TYPE_GPG)) { + if (pack.getPackageKeys() != null) { + for (PackageKey key : pack.getPackageKeys()) { + if (key.getType().equals(PackageFactory.PACKAGE_KEY_TYPE_GPG) && + key.getProvider() != null) { provider = key.getProvider().getName(); + } } } helper.add("provider", provider);
commit bf09a84c1cbd8102b344f6c1c813cf5b2b7f54a2 Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 16:51:33 2009 -0400
Automatic commit of package [spacewalk-proxy] release [0.6.5-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec index 74e9180..65f9545 100644 --- a/proxy/proxy/spacewalk-proxy.spec +++ b/proxy/proxy/spacewalk-proxy.spec @@ -4,7 +4,7 @@ Group: Applications/Internet License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 0.6.4 +Version: 0.6.5 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python @@ -288,6 +288,10 @@ fi
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.5-1 +- change comments to docstrings (msuchy@redhat.com) +- change comments to docstrings (msuchy@redhat.com) + * Mon Jun 15 2009 Miroslav Suchy msuchy@redhat.com 0.6.4-1 - 503187 - close tag
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy index 29725a0..c208048 100644 --- a/rel-eng/packages/spacewalk-proxy +++ b/rel-eng/packages/spacewalk-proxy @@ -1 +1 @@ -0.6.4-1 proxy/proxy/ +0.6.5-1 proxy/proxy/
commit 7d0ba942b2146681dea752be77d2cba89ff96688 Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 16:45:24 2009 -0400
Automatic commit of package [rhnpush] release [5.4.2-1].
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec index baa83b0..9a9f6e9 100644 --- a/client/tools/rhnpush/rhnpush.spec +++ b/client/tools/rhnpush/rhnpush.spec @@ -5,7 +5,7 @@ Summary: Common programs needed to be installed on the RHN servers/proxies Group: Applications/System License: GPLv2 URL: http://fedorahosted.org/spacewalk -Version: 5.4.1 +Version: 5.4.2 Release: 1%{?dist} Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -49,6 +49,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/solaris2mpm.8*
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 5.4.2-1 +- merging missed chances from previous commit (pkilambi@redhat.com) +- removing unused modules and some clean up (pkilambi@redhat.com) +- fixing rhnpush to work on fedora-11 clients. Replaced the deprecated + checksum modules and use hashlib instead. (pkilambi@redhat.com) + * Wed Apr 08 2009 Jan Pazdziora 5.4.1-1 - 488157 - turn sparcv9 into sparc
diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush index 43f65d2..48880cc 100644 --- a/rel-eng/packages/rhnpush +++ b/rel-eng/packages/rhnpush @@ -1 +1 @@ -5.4.1-1 client/tools/rhnpush/ +5.4.2-1 client/tools/rhnpush/
commit b2b5ffafbd58a24896f07d0f73df3ad43de33136 Author: Shannon Hughes shughes@redhat.com Date: Thu Jun 25 16:26:05 2009 -0400
oops, remove debug message
diff --git a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java index 9dddd81..0b94bfe 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java @@ -348,7 +348,6 @@ public class CreateChannelCommand { }
if (cname.length() > CHANNEL_NAME_MAX_LENGTH) { - System.out.println("YIIIIIIIIIIIKES"); Integer maxLength = new Integer(CreateChannelCommand.CHANNEL_NAME_MAX_LENGTH); throw new InvalidChannelNameException(cname, InvalidChannelNameException.Reason.TOO_LONG,
commit 916cc858b7e29f354143b94f87bfce98f2e5696c Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 16:11:27 2009 -0400
Automatic commit of package [rhnsd] release [4.5.10-1].
diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec index d3bab98..d18b3b9 100644 --- a/client/rhel/rhnsd/rhnsd.spec +++ b/client/rhel/rhnsd/rhnsd.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: %{name}-%{version}.tar.gz Url: http://rhn.redhat.com Name: rhnsd -Version: 4.5.9 +Version: 4.5.10 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +58,11 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man8/rhnsd.8*
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 4.5.10-1 +- 243699: fixing the error code when unknown command is used with rhnsd init + (pkilambi@redhat.com) +- updateing translations for rhnsd (pkilambi@redhat.com) + * Wed Jun 3 2009 Pradeep Kilambi pkilambi@redhat.com 4.7.0-3 - Resolves: #243699 -fixing error code for unknown command to rhnsd init script
diff --git a/rel-eng/packages/rhnsd b/rel-eng/packages/rhnsd index a1d3fda..9e96a69 100644 --- a/rel-eng/packages/rhnsd +++ b/rel-eng/packages/rhnsd @@ -1 +1 @@ -4.5.9-1 client/rhel/rhnsd/ +4.5.10-1 client/rhel/rhnsd/
commit 1ed0fce29b70421f2e090fd97c4eb6b004fc030a Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 16:09:47 2009 -0400
Automatic commit of package [smartpm] release [0.3-1].
diff --git a/client/solaris/smartpm/smartpm.spec b/client/solaris/smartpm/smartpm.spec index 615ad2c..78bcc20 100644 --- a/client/solaris/smartpm/smartpm.spec +++ b/client/solaris/smartpm/smartpm.spec @@ -9,7 +9,7 @@ Summary: Next generation package handling tool Name: smartpm Source0: smartpm-%{version}.tar.gz -Version: 0.2 +Version: 0.3 Release: 1 License: GPLv2 Group: Applications/System @@ -59,6 +59,12 @@ env %{__python} setup.py build %{python_sitearch}/rhn/actions/solarispkgs.py*
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.3-1 +- 498079 - the -u option has to be specified before the file name, in call to + unzip. (jpazdziora@redhat.com) +- 498079 - when unzip fails, show the actual error message and the target + directory. (jpazdziora@redhat.com) + * Mon Mar 23 2009 Devan Goodwin dgoodwin@redhat.com 0.2-1 - Rebuild from Spacewalk git.
diff --git a/rel-eng/packages/smartpm b/rel-eng/packages/smartpm index 45ef377..a059bca 100644 --- a/rel-eng/packages/smartpm +++ b/rel-eng/packages/smartpm @@ -1 +1 @@ -0.2-1 client/solaris/smartpm/ +0.3-1 client/solaris/smartpm/
commit 1a824379f9096447ce5478bea7d7b9c82f003fae Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 16:03:33 2009 -0400
Automatic commit of package [spacewalk-koan] release [0.1.15-1].
diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec index a959484..b036399 100644 --- a/client/tools/spacewalk-koan/spacewalk-koan.spec +++ b/client/tools/spacewalk-koan/spacewalk-koan.spec @@ -3,7 +3,7 @@ Name: spacewalk-koan Group: System Environment/Kernel License: GPLv2 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 0.1.14 +Version: 0.1.15 Release: 1%{?dist} BuildArch : noarch URL: https://fedorahosted.org/spacewalk @@ -49,6 +49,16 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/rhn/actions/
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.1.15-1 +- fixing spacewalk-koan spec file to build for 2.1 properly + (jsherril@redhat.com) +- 497571 - switching to python 1.5 requires since we have to support 2.1 + (mmccune@gmail.com) +- 497571 - switch from True/False to 0/1 to support rhel 2.1 and + (mmccune@gmail.com) +- 503996 - Added some information on the error message to the status returned + to the server. (jason.dobies@redhat.com) + * Thu May 21 2009 jesus m. rodriguez jesusr@redhat.com 0.1.14-1 - 497424 - Slight redesign of the KS Virt UI to deal with duplicate virt paths (paji@redhat.com)
diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-koan index b13db85..02f7d1f 100644 --- a/rel-eng/packages/spacewalk-koan +++ b/rel-eng/packages/spacewalk-koan @@ -1 +1 @@ -0.1.14-1 client/tools/spacewalk-koan/ +0.1.15-1 client/tools/spacewalk-koan/
commit 91b30ed7b3897e831a6c28916f80dac575055f66 Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 15:59:28 2009 -0400
Automatic commit of package [osad] release [5.9.15-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index b9a6377..e165bda 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -9,7 +9,7 @@ Group: System Environment/Daemons License: GPLv2 URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 5.9.14 +Version: 5.9.15 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -236,6 +236,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvvi {}
# $Id$ %changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 5.9.15-1 +- 508064 - fix osad installation errors on client (mzazrivec@redhat.com) + * Thu Jun 18 2009 Jan Pazdziora 5.9.14-1 - 505606 - Require at least selinux-policy 2.4.6-114
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index 253e469..98af1c7 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.9.14-1 client/tools/osad/ +5.9.15-1 client/tools/osad/
commit 6b351ad5556d0b64390317e350adac7b851a7bf9 Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 15:57:15 2009 -0400
Automatic commit of package [rhn-client-tools] release [0.4.28-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index 53f9279..5dc8c60 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/%%7Bname%7D-%%7Bversion%7D.t... URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools -Version: 0.4.27 +Version: 0.4.28 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -204,6 +204,22 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/rhn_register.desktop
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.4.28-1 +- 503090 - Fix missing packages reported during rhnreg_ks. + (dgoodwin@redhat.com) +- 467866 - Raise a more cleaner message if clients end up getting badStatusLine + error due to 502 proxy errors (pkilambi@redhat.com) +- 504292 - fix the registration gui and tui to honor the ssl cert paths + specified in the config. Set the paths to default locations only if the user + hasn't explicitly defined it. (pkilambi@redhat.com) +- 504296 - removing debug statements from hardware probing + (pkilambi@redhat.com) +- Support infinite available entitlements in TUI registration + (jbowes@redhat.com) +- account for virt_uuid is None case (pkilambi@redhat.com) +- Send smbios data to remaining_subscriptions during registration + (jbowes@redhat.com) + * Fri Jun 5 2009 Pradeep Kilambi pkilambi@redhat.com - Resolves: #504296
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools index 45c8eb1..ef7f6d9 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -0.4.27-1 client/rhel/rhn-client-tools/ +0.4.28-1 client/rhel/rhn-client-tools/
commit 0d144650ded5dd72dd297336d0f693bca240004f Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 15:56:03 2009 -0400
Automatic commit of package [yum-rhn-plugin] release [0.5.6-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec index dcc986c..a4e6556 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -1,7 +1,7 @@ Summary: RHN support for yum Name: yum-rhn-plugin Source: %{name}-%{version}.tar.gz -Version: 0.5.5 +Version: 0.5.6 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base @@ -59,6 +59,12 @@ make -f Makefile.yum-rhn-plugin install VERSION=%{version}-%{release} PREFIX=$RP
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.5.6-1 +- yum operations are not getting redirected as the GET requested is formed at + the plugin level and not through rhnlib. (pkilambi@redhat.com) +- 467866 - Raise a more cleaner message if clients end up getting badStatusLine + error due to 502 proxy errors (pkilambi@redhat.com) + * Thu May 21 2009 jesus m. rodriguez jesusr@redhat.com 0.5.5-1 - merging additional spec changes and minor edits from svn (pkilambi@redhat.com) - 467866 - catch the BadStatusLine and let use know that the server is diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin index 482c9e0..1544f8d 100644 --- a/rel-eng/packages/yum-rhn-plugin +++ b/rel-eng/packages/yum-rhn-plugin @@ -1 +1 @@ -0.5.5-1 client/rhel/yum-rhn-plugin/ +0.5.6-1 client/rhel/yum-rhn-plugin/
commit 8e75e3243e49b311c58a42690581bc3e446df27b Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 15:54:04 2009 -0400
Automatic commit of package [SputLite] release [0.48.11-1].
diff --git a/monitoring/SputLite/SputLite.spec b/monitoring/SputLite/SputLite.spec index fe920dc..67cb384 100644 --- a/monitoring/SputLite/SputLite.spec +++ b/monitoring/SputLite/SputLite.spec @@ -5,7 +5,7 @@ %define vardir /var/lib/nocpulse Name: SputLite Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 0.48.10 +Version: 0.48.11 Release: 1%{?dist} Summary: Command queue processor (Sputnik Lite) URL: https://fedorahosted.org/spacewalk @@ -100,6 +100,9 @@ fi rm -rf $RPM_BUILD_ROOT
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.48.11-1 +- Don't move execute_commands.log to /var/log/nocpulse (mzazrivec@redhat.com) + * Mon May 11 2009 Milan Zazrivec mzazrivec@redhat.com 0.48.10-1 - 498257 - migrate existing files into new nocpulse homedir
diff --git a/rel-eng/packages/SputLite b/rel-eng/packages/SputLite index c6bf7a2..ec1b4da 100644 --- a/rel-eng/packages/SputLite +++ b/rel-eng/packages/SputLite @@ -1 +1 @@ -0.48.10-1 monitoring/SputLite/ +0.48.11-1 monitoring/SputLite/
commit 63259e39c86e8d15b078252ba3def56eb714c827 Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 15:52:32 2009 -0400
Automatic commit of package [SatConfig-cluster] release [1.54.6-1].
diff --git a/monitoring/SatConfig/cluster/SatConfig-cluster.spec b/monitoring/SatConfig/cluster/SatConfig-cluster.spec index 06730d8..c81e30b 100644 --- a/monitoring/SatConfig/cluster/SatConfig-cluster.spec +++ b/monitoring/SatConfig/cluster/SatConfig-cluster.spec @@ -1,6 +1,6 @@ %define sysv_dir %{_sysconfdir}/rc.d/np.d Name: SatConfig-cluster -Version: 1.54.5 +Version: 1.54.6 Release: 1%{?dist} Summary: Satellite Configuration System - cluster information URL: https://fedorahosted.org/spacewalk @@ -57,6 +57,10 @@ install -m 644 SatCluster.pm $RPM_BUILD_ROOT%{perl_vendorlib}/NOCpulse/ rm -rf $RPM_BUILD_ROOT
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 1.54.6-1 +- 490783 - preventing to read a config file, that must not exist + (tlestach@redhat.com) + * Thu Apr 23 2009 jesus m. rodriguez jesusr@redhat.com 1.54.5-1 - change Source0 to point to fedorahosted.org (msuchy@redhat.com)
diff --git a/rel-eng/packages/SatConfig-cluster b/rel-eng/packages/SatConfig-cluster index 7df6213..d310162 100644 --- a/rel-eng/packages/SatConfig-cluster +++ b/rel-eng/packages/SatConfig-cluster @@ -1 +1 @@ -1.54.5-1 monitoring/SatConfig/cluster/ +1.54.6-1 monitoring/SatConfig/cluster/
commit 098ee22db9277fe6e67ff876570b3bd276623d30 Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 15:17:03 2009 -0400
Automatic commit of package [spacewalk-branding] release [0.6.6-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 50dd3fd..f4bb8bb 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -1,5 +1,5 @@ Name: spacewalk-branding -Version: 0.6.5 +Version: 0.6.6 Release: 1%{?dist} Summary: Spacewalk branding data
@@ -68,6 +68,13 @@ rm -rf %{buildroot}
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.6-1 +- 506489 - remove the link associated with the org name present in the UI + header (bbuckingham@redhat.com) +- 505101 - update css so that links are underlined when hovering + (bbuckingham@redhat.com) +- fix to shwo the correct error message css (paji@redhat.com) + * Wed May 27 2009 jesus m. rodriguez jesusr@redhat.com 0.6.5-1 - 500806 - limit a:hover to links only, changed to a:link:hover (jesusr@redhat.com)
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index 8f85162..ed657c3 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -0.6.5-1 branding/ +0.6.6-1 branding/
commit e5c5582e1230937a2865d6fe1fdf08c8ff1bacf1 Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 15:12:34 2009 -0400
Automatic commit of package [spacewalk-config] release [0.6.8-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config index 2f739b8..e483978 100644 --- a/rel-eng/packages/spacewalk-config +++ b/rel-eng/packages/spacewalk-config @@ -1 +1 @@ -0.6.7-1 spacewalk/config/ +0.6.8-1 spacewalk/config/ diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec index 0e42c3b..d40cbd6 100644 --- a/spacewalk/config/spacewalk-config.spec +++ b/spacewalk/config/spacewalk-config.spec @@ -2,7 +2,7 @@
Name: spacewalk-config Summary: Spacewalk Configuration -Version: 0.6.7 +Version: 0.6.8 Release: 1%{?dist} URL: http://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -114,6 +114,9 @@ fi
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.8-1 +- Fix mod_jk failure to load. (dgoodwin@redhat.com) + * Wed Jun 24 2009 John Matthews jmatthew@redhat.com 0.6.7-1 - 507679 - Added custom server.xml to force UTF8 encoding of GET parameters in tomcat
commit cbb6f61ed81f61fbd0710c279d1a4d8ebfb80910 Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 15:11:24 2009 -0400
Automatic commit of package [spacewalk-web] release [0.6.9-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 9d57df0..eadcbde 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -0.6.8-1 web/ +0.6.9-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 2c6d85d..97782ed 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -2,7 +2,7 @@ Name: spacewalk-web Summary: Spacewalk Web site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -317,6 +317,19 @@ rm -rf $RPM_BUILD_ROOT
# $Id$ %changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.9-1 +- 506154 - Added "wrap" option to textarea widget. Set to off for remote + command script editing page. (jason.dobies@redhat.com) +- 501933 - Changed the script rendering to wrap in a readonly textarea. + (jason.dobies@redhat.com) +- 505315 - checking in missing file from previous commit (jsherril@redhat.com) +- 505315 - fixing issue where cobbler provisioning couldnt occur through a 5.3 + proxy if installed through the webui (jsherril@redhat.com) +- 502259 - fixing issue where systems would not show up on applicable systems + page of patches (jsherril@redhat.com) +- 504327 - fixing acl for chcecking needed install tab (shughes@redhat.com) +- 503187 - set MaxRequestsPerChild to 200 (WebUI installer) (msuchy@redhat.com) + * Fri Jun 05 2009 jesus m. rodriguez jesusr@redhat.com 0.6.8-1 - 197294 - add hardware report support for CAPTURE cards (shughes@redhat.com) - 500709 - html error code page support for sessionless bots (shughes@redhat.com)
commit 73c2bdc684d5c19ed6a0a1ac381efc9e7f4a06c6 Author: Pradeep Kilambi pkilambi@redhat.com Date: Thu Jun 25 14:06:27 2009 -0400
508104 - Fixing the registration with eus channel to return receiving_updates in the query.
diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py index 8193d11..e0a28f2 100644 --- a/backend/server/rhnChannel.py +++ b/backend/server/rhnChannel.py @@ -1088,7 +1088,8 @@ def base_eus_channel_for_ver_rel_arch(version, release, server_arch, select c.id, c.label, c.name, - rcm.release + rcm.release, + c.receiving_updates from rhnChannelPermissions cp, rhnChannel c,
commit 631cfdeef9de27aa92d017181b33f3638e91d1ba Author: Shannon Hughes shughes@redhat.com Date: Thu Jun 25 12:15:43 2009 -0400
456985 - fix ise on channel creation
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 0845b9f..5ea102d 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 @@ -469,6 +469,12 @@ public class EditChannelAction extends RhnAction implements Listable { CreateChannelCommand.CHANNEL_NAME_MIN_LENGTH)); break;
+ case TOO_LONG: + errors.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("edit.channel.invalidchannelname.maxlength", + CreateChannelCommand.CHANNEL_NAME_MAX_LENGTH)); + break; + case NAME_IN_USE: errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("edit.channel.invalidchannelname.nameinuse", diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 12d363a..8db5c8a 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -8139,6 +8139,12 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/channels/manage/Edit</context> </context-group> </trans-unit> + <trans-unit id="edit.channel.invalidchannelname.maxlength"> + <source>Channel name can not exceed {0} characters long</source> + <context-group name="ctx"> + <context context-type="sourcefile">/channels/manage/Edit</context> + </context-group> + </trans-unit> <trans-unit id="edit.channel.invalidchannelname.nameinuse"> <source>The channel name '{0}' is already in use, please enter a different name</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelNameException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelNameException.java index a1d1b07..33242d1 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelNameException.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/InvalidChannelNameException.java @@ -103,6 +103,7 @@ public class InvalidChannelNameException extends FaultException { public enum Reason { REGEX_FAILS, TOO_SHORT, + TOO_LONG, IS_MISSING, NAME_IN_USE, RHN_CHANNEL_BAD_PERMISSIONS diff --git a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java index 8ee65e9..9dddd81 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java @@ -36,6 +36,7 @@ import java.util.regex.Pattern; public class CreateChannelCommand {
public static final int CHANNEL_NAME_MIN_LENGTH = 6; + public static final int CHANNEL_NAME_MAX_LENGTH = 64; public static final int CHANNEL_LABEL_MIN_LENGTH = 6;
protected static final String CHANNEL_NAME_REGEX = @@ -346,6 +347,15 @@ public class CreateChannelCommand { minLength.toString()); }
+ if (cname.length() > CHANNEL_NAME_MAX_LENGTH) { + System.out.println("YIIIIIIIIIIIKES"); + Integer maxLength = new Integer(CreateChannelCommand.CHANNEL_NAME_MAX_LENGTH); + throw new InvalidChannelNameException(cname, + InvalidChannelNameException.Reason.TOO_LONG, + "edit.channel.invalidchannelname.maxlength", + maxLength.toString()); + } + // the perl code used to ignore case with a /i at the end of // the regex, so we toLowerCase() the channel name to make it // work the same.
commit c5ceeda0c00ed34b5dbd636a5584563a26145cca Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 12:01:35 2009 -0400
Automatic commit of package [spacewalk-search] release [0.6.11-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index bcd06f8..dba4dec 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -0.6.10-1 search-server/ +0.6.11-1 search-server/ diff --git a/search-server/spacewalk-search.spec b/search-server/spacewalk-search.spec index be152c2..66f5303 100644 --- a/search-server/spacewalk-search.spec +++ b/search-server/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 0.6.10 +Version: 0.6.11 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -112,6 +112,12 @@ fi %{_sysconfdir}/logrotate.d/rhn-search
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.11-1 +- 487014 - SystemSearch remove score requirement to redirect to SDC on 1 result + (jmatthew@redhat.com) +- DocumentationSearch fixing returned links so they are relative and update for + segment dir (jmatthew@redhat.com) + * Mon Jun 01 2009 jesus m. rodriguez jesusr@redhat.com 0.6.10-1 - added java debugger options for local dev config (jesusr@redhat.com) - store pid file locally. (jesusr@redhat.com)
commit 8288ee2dd4f507bc9dd9d49f94807f4c724beae7 Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 11:42:17 2009 -0400
Automatic commit of package [spacewalk-java] release [0.6.27-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 4e41ef7..e6b5a8e 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -11,7 +11,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 0.6.26 +Version: 0.6.27 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -250,6 +250,95 @@ fi %attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.27-1 +- Remove catch/log return null of HibernateExceptions. (dgoodwin@redhat.com) +- Fix server migration when source org has > 1000 org admins. + (dgoodwin@redhat.com) +- Fix to make sure kernel param entries don;t get duplicated (paji@redhat.com) +- 492206 - Fixed kickstart template error (paji@redhat.com) +- 507533 - added catch around unhandled exception for pkg in mutiple channels + (shughes@redhat.com) +- 507862 - Fixed an ise that occured when config deploy was selected on a + profile (paji@redhat.com) +- 507863 - fixing issue where enabling remote commands would not be saved + (jsherril@redhat.com) +- 507888 - Set the default virt mem value to 512 instead of 256 + (paji@redhat.com) +- hopeflly fixing unit test (jsherril@redhat.com) +- Fixed a unit test (paji@redhat.com) +- 506702 - Converted probe details page to use the new list to get the correct + csv (paji@redhat.com) +- Fixed a nitpick that memory didnt sya memMb (paji@redhat.com) +- 507097 - Fixed guest provisioning virt settings (paji@redhat.com) +- Adding repodata details for a given channel to channelDetails page. + (pkilambi@redhat.com) +- 506816 - fixing issue where virt hosts that begin to use sat 5.3 could not + install spacewalk-koan (jsherril@redhat.com) +- 506693 - removed more contact.pxt references (shughes@redhat.com) +- 507046 & 507048 - Fixed a couple of cobbler issues (paji@redhat.com) +- Added a fix to master to ignore profiles that have not yet been synced to + cobbler.. (paji@redhat.com) +- Fix for html:errors and html:messages to be consitently viewed in the UI + (paji@redhat.com) +- 506726 - do not allow links for null org channel management + (shughes@redhat.com) +- 506705 - removed invalid rhn require tag (shughes@redhat.com) +- 506693 - remove contact.pxt link from 404 message (shughes@redhat.com) +- 506509 - Fixed an ssm query.. Accidental typo.. (paji@redhat.com) +- 506509 - Fixed ISE on Config Deploy pages (paji@redhat.com) +- Checkstyle fix. (dgoodwin@redhat.com) +- 506608 - fixing issue where source packages could not be downloaded from the + package details page (jsherril@redhat.com) +- Fix monitoring action unit tests. (dgoodwin@redhat.com) +- Attempt to fix ChannelManagerTest.testListErrata. (dgoodwin@redhat.com) +- 506342 - fix system count for consumed channel sharing (shughes@redhat.com) +- 506341 - fix system count for provided shared channels (shughes@redhat.com) +- 495406 - Changed package arch lookup for ACLs to use arch labels instead of + hibernate objects. (jason.dobies@redhat.com) +- 506489 - remove the link associated with the org name present in the UI + header (bbuckingham@redhat.com) +- Adding missed EusReleaseComparator file. (dgoodwin@redhat.com) +- 506492, 506139 - PackageSearch default quick search to searching all arches & + fix no result if systems aren't registered (jmatthew@redhat.com) +- 506296 - Repair EUS logic after removal of is_default column. + (dgoodwin@redhat.com) +- 506144 - apidoc - packages.search - adding missing files to return value + (bbuckingham@redhat.com) +- fix unit test cases (shughes@redhat.com) +- removed a duplicate string resources entry (paji@redhat.com) +- Fix some of the failing EUS unit tests. (dgoodwin@redhat.com) +- 505616 - Fixing the eus logic that gets the latest and the default eus + channels to not depend on is_default column. Thanks to jsherril for his help + on this. (pkilambi@redhat.com) +- Fixed a set of unit tests which owere looking for ActtionMessagess instead of + ActionErrors (paji@redhat.com) +- Unit test fix (paji@redhat.com) +- Fixed unit test: was looking for errors as part of action messages + (jason.dobies@redhat.com) +- Remove hibernate mappings for rhnReleaseChannelMap is_default column. + (dgoodwin@redhat.com) +- unit test fix (jsherril@redhat.com) +- unit test fix (jsherril@redhat.com) +- 431673 - reworking rhnServerNeededView for performance fixes. + (mmccune@gmail.com) +- 505170 - api - proxy.deactivateProxy - was generating internal exception + (bbuckingham@redhat.com) +- 505327 - fixing url parse for advanced kickstart options (shughes@redhat.com) +- 498650 - HTML escape monitoring data before displaying. (dgoodwin@redhat.com) +- Revert "498650 - html escape of monitoring data before displaying on the + WEBUI" (dgoodwin@redhat.com) +- 498650 - html escape of monitoring data before displaying on the WEBUI + (tlestach@redhat.com) +- 492206 - Fixed cobbler error url to point to KS file download page which has + better info on cheetah stacktrace (paji@redhat.com) +- 505188 - fixing issues causing rhel2.1 provisioning to not work + (jsherril@redhat.com) +- 490960 - ErrataSearch, fix for multiorg channel permissions + (jmatthew@redhat.com) +- fix to shwo the correct error message css (paji@redhat.com) +- 504804 - Need to stuff the relevant flag back into the request so it's used + in the package name URLs. (jason.dobies@redhat.com) + * Wed Jun 10 2009 jesus m. rodriguez jesusr@redhat.com 0.6.26-1 - 504806 - Added missing channel_filter attribute that was being lost during pagination. (jason.dobies@redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 19a8cd5..747ed8f 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -0.6.26-1 java/ +0.6.27-1 java/
commit 418c807411eaad10462e9746c2b5d512583d9b8b Author: Devan Goodwin dgoodwin@redhat.com Date: Thu Jun 25 12:39:14 2009 -0300
Remove catch/log return null of HibernateExceptions.
Dangerous thing to do, can result in getting back null or no results, when infact you expect results, and the only indication that something went wrong is a single line error message in the logs. HibernateException indicates something is wrong, should not be hidden.
diff --git a/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java b/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java index 1cda1ae..e5a94e2 100644 --- a/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java +++ b/java/code/src/com/redhat/rhn/domain/action/ActionFactory.java @@ -461,17 +461,9 @@ public class ActionFactory extends HibernateFactory { * @return the Action found */ public static Action lookupById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - Action a = (Action)session.get(Action.class, id); - return a; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - throw new HibernateRuntimeException( - "HibernateException while trying to lookup Action", he); - } + Session session = HibernateFactory.getSession(); + Action a = (Action)session.get(Action.class, id); + return a; }
/** @@ -525,19 +517,11 @@ public class ActionFactory extends HibernateFactory { */ public static ConfigRevisionAction lookupConfigRevisionAction(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - ConfigRevisionAction c = (ConfigRevisionAction) session. - get(ConfigRevisionAction.class, - id); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString(), he); - - } - return null; + + Session session = HibernateFactory.getSession(); + ConfigRevisionAction c = (ConfigRevisionAction) session. + get(ConfigRevisionAction.class, id); + return c; }
/** diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java index 4837cf1..06d5248 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java @@ -70,16 +70,9 @@ public class ChannelFactory extends HibernateFactory { * @return the Channel found */ public static Channel lookupById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - Channel c = (Channel) session.get(Channel.class, id); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + Channel c = (Channel) session.get(Channel.class, id); + return c; }
/** diff --git a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java index 00592d6..4eabe31 100644 --- a/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java +++ b/java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java @@ -26,7 +26,6 @@ import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.user.User;
import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.criterion.Restrictions;
@@ -318,16 +317,9 @@ public class ConfigurationFactory extends HibernateFactory { * @return the ConfigChannel found or null if not found. */ public static ConfigChannel lookupConfigChannelById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - ConfigChannel c = (ConfigChannel)session.get(ConfigChannel.class, id); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + ConfigChannel c = (ConfigChannel)session.get(ConfigChannel.class, id); + return c; }
/** @@ -341,37 +333,24 @@ public class ConfigurationFactory extends HibernateFactory { public static ConfigChannel lookupConfigChannelByLabel(String label, Org org, ConfigChannelType cct) { - Session session = null; - try { - session = HibernateFactory.getSession(); - ConfigChannel c = (ConfigChannel) session.createCriteria(ConfigChannel.class). - add(Restrictions.eq("org", org)). - add(Restrictions.eq("label", label)). - add(Restrictions.eq("configChannelType", cct)). - uniqueResult(); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + ConfigChannel c = (ConfigChannel) session.createCriteria(ConfigChannel.class). + add(Restrictions.eq("org", org)). + add(Restrictions.eq("label", label)). + add(Restrictions.eq("configChannelType", cct)). + uniqueResult(); + return c; } + /** * Lookup a ConfigFile by its id * @param id The identifier for the ConfigFile * @return the ConfigFile found or null if not found. */ public static ConfigFile lookupConfigFileById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - ConfigFile c = (ConfigFile)session.get(ConfigFile.class, id); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + ConfigFile c = (ConfigFile)session.get(ConfigFile.class, id); + return c; }
/** @@ -381,24 +360,16 @@ public class ConfigurationFactory extends HibernateFactory { * @return the ConfigFile found or null if not found. */ public static ConfigFile lookupConfigFileByChannelAndName(Long channel, Long name) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (ConfigFile) - session.getNamedQuery("ConfigFile.findByChannelAndName") - .setLong("channel_id", channel.longValue()) - .setLong("name_id", name.longValue()) - .setLong("state_id", ConfigFileState.normal(). - getId().longValue()) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session = HibernateFactory.getSession(); + return (ConfigFile) + session.getNamedQuery("ConfigFile.findByChannelAndName") + .setLong("channel_id", channel.longValue()) + .setLong("name_id", name.longValue()) + .setLong("state_id", ConfigFileState.normal(). + getId().longValue()) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); }
/** @@ -407,16 +378,9 @@ public class ConfigurationFactory extends HibernateFactory { * @return The sought for ConfigRevision or null if not found. */ public static ConfigRevision lookupConfigRevisionById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - ConfigRevision a = (ConfigRevision)session.get(ConfigRevision.class, id); - return a; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + ConfigRevision a = (ConfigRevision)session.get(ConfigRevision.class, id); + return a; }
/** @@ -425,16 +389,9 @@ public class ConfigurationFactory extends HibernateFactory { * @return The sought for ConfigInfo or null if not found. */ public static ConfigInfo lookupConfigInfoById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - ConfigInfo c = (ConfigInfo)session.get(ConfigInfo.class, id); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + ConfigInfo c = (ConfigInfo)session.get(ConfigInfo.class, id); + return c; }
/** @@ -443,16 +400,9 @@ public class ConfigurationFactory extends HibernateFactory { * @return The sought for ConfigFileName or null if not found. */ public static ConfigFileName lookupConfigFileNameById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - ConfigFileName c = (ConfigFileName)session.get(ConfigFileName.class, id); - return c; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + ConfigFileName c = (ConfigFileName)session.get(ConfigFileName.class, id); + return c; }
@@ -465,21 +415,13 @@ public class ConfigurationFactory extends HibernateFactory { * @return A sought for ConfigChannelType or null */ static ConfigChannelType lookupConfigChannelTypeByLabel(String label) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (ConfigChannelType) - session.getNamedQuery("ConfigChannelType.findByLabel") - .setString("label", label) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session = HibernateFactory.getSession(); + return (ConfigChannelType) + session.getNamedQuery("ConfigChannelType.findByLabel") + .setString("label", label) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); }
/** @@ -491,20 +433,12 @@ public class ConfigurationFactory extends HibernateFactory { * @return A sought for ConfigFileState or null */ static ConfigFileState lookupConfigFileStateByLabel(String label) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (ConfigFileState)session.getNamedQuery("ConfigFileState.findByLabel") - .setString("label", label) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session = HibernateFactory.getSession(); + return (ConfigFileState)session.getNamedQuery("ConfigFileState.findByLabel") + .setString("label", label) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); }
/** @@ -513,21 +447,14 @@ public class ConfigurationFactory extends HibernateFactory { * @return config filetype object */ static ConfigFileType lookupConfigFileTypeByLabel(String label) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (ConfigFileType)session.getNamedQuery("ConfigFileType.findByLabel") - .setString("label", label) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session = HibernateFactory.getSession(); + return (ConfigFileType)session.getNamedQuery("ConfigFileType.findByLabel") + .setString("label", label) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); } + /** * Return a <code>ConfigInfo</code> for the username, groupname, and * file mode given. If no corresponding entry exists yet in the database, one will be diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java index 22e57c2..d3962d6 100644 --- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java +++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java @@ -601,22 +601,15 @@ public class ErrataFactory extends HibernateFactory { * @return the Errata found */ public static Errata lookupById(Long id) { - Session session = null; - try { - //Look for published Errata first - session = HibernateFactory.getSession(); - Errata errata = (Errata) session.get(PublishedErrata.class, id); + //Look for published Errata first + Session session = HibernateFactory.getSession(); + Errata errata = (Errata) session.get(PublishedErrata.class, id);
- //If we nothing was found, look for it in the Unpublished Errata table... - if (errata == null) { - errata = (Errata) session.get(UnpublishedErrata.class, id); - } - return errata; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + //If we nothing was found, look for it in the Unpublished Errata table... + if (errata == null) { + errata = (Errata) session.get(UnpublishedErrata.class, id); } - return null; + return errata; }
/** diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java b/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java index b64edc8..337681c 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/satcluster/SatClusterFactory.java @@ -22,7 +22,6 @@ import java.util.List;
import org.apache.commons.lang.RandomStringUtils; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session;
import com.redhat.rhn.common.hibernate.HibernateFactory; @@ -50,17 +49,10 @@ public class SatClusterFactory extends HibernateFactory { }
private static PhysicalLocation lookupPhysicalLocation(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - PhysicalLocation u = (PhysicalLocation) - session.get(PhysicalLocation.class, id); - return u; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + PhysicalLocation u = (PhysicalLocation) + session.get(PhysicalLocation.class, id); + return u; }
/** diff --git a/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java b/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java index 48cbd7c..ed26a7c 100644 --- a/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java +++ b/java/code/src/com/redhat/rhn/domain/org/OrgImpl.java @@ -29,7 +29,6 @@ import java.util.Set;
import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session;
import com.redhat.rhn.common.db.datasource.CallableMode; @@ -444,22 +443,15 @@ public class OrgImpl extends BaseDomainHelper implements Org {
/** {@inheritDoc} */ public int numActiveOrgAdmins() { - Session session = null; - try { - session = HibernateFactory.getSession(); - List list = session.getNamedQuery("Org.numOfOrgAdmins") - .setParameter("org_id", this.getId()) - // Retrieve from cache if there - .list(); - if (list != null) { - return list.size(); - } - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + Session session = HibernateFactory.getSession(); + List list = session.getNamedQuery("Org.numOfOrgAdmins") + .setParameter("org_id", this.getId()) + // Retrieve from cache if there + .list(); + if (list != null) { + return list.size(); } return 0; - }
/** diff --git a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java index 25e375f..9eaa9bd 100644 --- a/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java +++ b/java/code/src/com/redhat/rhn/domain/rhnpackage/PackageEvrFactory.java @@ -19,7 +19,6 @@ import com.redhat.rhn.common.db.datasource.ModeFactory; import com.redhat.rhn.common.hibernate.HibernateFactory;
import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session;
import java.sql.Types; @@ -86,16 +85,9 @@ public class PackageEvrFactory { * @return the PackageEvr found */ public static PackageEvr lookupPackageEvrById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (PackageEvr) session.getNamedQuery("PackageEvr.findById").setString( - "id", id.toString()).uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception (PackageEvr): " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return (PackageEvr) session.getNamedQuery("PackageEvr.findById").setString( + "id", id.toString()).uniqueResult(); }
} diff --git a/java/code/src/com/redhat/rhn/domain/role/RoleFactory.java b/java/code/src/com/redhat/rhn/domain/role/RoleFactory.java index b2cf5eb..fc2a403 100644 --- a/java/code/src/com/redhat/rhn/domain/role/RoleFactory.java +++ b/java/code/src/com/redhat/rhn/domain/role/RoleFactory.java @@ -17,7 +17,6 @@ package com.redhat.rhn.domain.role; import com.redhat.rhn.common.hibernate.HibernateFactory;
import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session;
/** @@ -54,19 +53,12 @@ public class RoleFactory extends HibernateFactory { * @return the Role with the given id. */ public static Role lookupById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (Role) session.getNamedQuery("Role.findById") - .setString("id", id.toString()) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return (Role) session.getNamedQuery("Role.findById") + .setString("id", id.toString()) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); }
/** @@ -75,19 +67,12 @@ public class RoleFactory extends HibernateFactory { * @return statetype whose name matches the given name. */ public static Role lookupByLabel(String name) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (Role) session.getNamedQuery("Role.findByLabel") - .setString("label", name) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return (Role) session.getNamedQuery("Role.findByLabel") + .setString("label", name) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); }
/** diff --git a/java/code/src/com/redhat/rhn/domain/satellite/CertificateFactory.java b/java/code/src/com/redhat/rhn/domain/satellite/CertificateFactory.java index 9e52ce4..b73c259 100644 --- a/java/code/src/com/redhat/rhn/domain/satellite/CertificateFactory.java +++ b/java/code/src/com/redhat/rhn/domain/satellite/CertificateFactory.java @@ -17,7 +17,6 @@ package com.redhat.rhn.domain.satellite; import com.redhat.rhn.common.hibernate.HibernateFactory;
import org.apache.log4j.Logger; -import org.hibernate.HibernateException;
/** * SatelliteFactory @@ -44,16 +43,10 @@ public class CertificateFactory extends HibernateFactory { * @return the newest versiono of the satellite's certificate */ public static SatelliteCertificate lookupNewestCertificate() { - try { - return (SatelliteCertificate) singleton.lookupObjectByNamedQuery( - "SatelliteCertificate.lookupNewestCertificate", - null, - false); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + return (SatelliteCertificate) singleton.lookupObjectByNamedQuery( + "SatelliteCertificate.lookupNewestCertificate", + null, + false); }
} diff --git a/java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory.java b/java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory.java index 6fa05fe..ee0da4f 100644 --- a/java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory.java +++ b/java/code/src/com/redhat/rhn/domain/satellite/SatelliteFactory.java @@ -17,7 +17,6 @@ package com.redhat.rhn.domain.satellite; import com.redhat.rhn.common.hibernate.HibernateFactory;
import org.apache.log4j.Logger; -import org.hibernate.HibernateException;
/** * SatelliteFactory @@ -44,13 +43,7 @@ public class SatelliteFactory extends HibernateFactory { * @return the newest version of the satellite's certificate */ public static SatelliteCertificate lookupNewestCertificate() { - try { - return (SatelliteCertificate) singleton.lookupObjectByNamedQuery( - "SatelliteCertificate.lookupNewestCertificate", null, false); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + return (SatelliteCertificate) singleton.lookupObjectByNamedQuery( + "SatelliteCertificate.lookupNewestCertificate", null, false); } } diff --git a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java index 36c8ac6..2ac9d88 100644 --- a/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java +++ b/java/code/src/com/redhat/rhn/domain/server/ServerFactory.java @@ -31,7 +31,6 @@ import com.redhat.rhn.manager.system.UpdateBaseChannelCommand;
import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Session;
import java.sql.Types; @@ -69,19 +68,12 @@ public class ServerFactory extends HibernateFactory { return null; }
- Session session = null; - try { - session = HibernateFactory.getSession(); - return (CustomDataValue) session.getNamedQuery( - "CustomDataValue.findByServerAndKey").setEntity("server", - server).setEntity("key", key) - // Retrieve from cache if there - .setCacheable(true).uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return (CustomDataValue) session.getNamedQuery( + "CustomDataValue.findByServerAndKey").setEntity("server", + server).setEntity("key", key) + // Retrieve from cache if there + .setCacheable(true).uniqueResult(); }
/** @@ -325,19 +317,11 @@ public class ServerFactory extends HibernateFactory { * @return The ServerArch */ public static ServerArch lookupServerArchByLabel(String label) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (ServerArch) session.getNamedQuery("ServerArch.findByLabel") - .setString("label", label) - // Retrieve from cache if there - .setCacheable(true).uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session = HibernateFactory.getSession(); + return (ServerArch) session.getNamedQuery("ServerArch.findByLabel") + .setString("label", label) + // Retrieve from cache if there + .setCacheable(true).uniqueResult(); }
/** @@ -346,19 +330,11 @@ public class ServerFactory extends HibernateFactory { * @return The CPUArch */ public static CPUArch lookupCPUArchByName(String name) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (CPUArch) session.getNamedQuery("CPUArch.findByName") - .setString("name", name) - // Retrieve from cache if there - .setCacheable(true).uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session = HibernateFactory.getSession(); + return (CPUArch) session.getNamedQuery("CPUArch.findByName") + .setString("name", name) + // Retrieve from cache if there + .setCacheable(true).uniqueResult(); }
/** diff --git a/java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.java b/java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.java index b8774b5..c90a31f 100644 --- a/java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.java +++ b/java/code/src/com/redhat/rhn/domain/session/WebSessionFactory.java @@ -18,7 +18,6 @@ import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.user.User;
import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Query; import org.hibernate.Session;
@@ -60,18 +59,8 @@ public class WebSessionFactory extends HibernateFactory { * @return the Session found */ public static WebSession lookupById(Long id) { - - Session session = null; - - try { - session = HibernateFactory.getSession(); - return (WebSession)session.get(WebSessionImpl.class, id); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + Session session = HibernateFactory.getSession(); + return (WebSession)session.get(WebSessionImpl.class, id); }
/** @@ -98,15 +87,10 @@ public class WebSessionFactory extends HibernateFactory { * @param user the user whose sessions are to be purged. */ public static void purgeUserSessions(User user) { - try { - Session session = HibernateFactory.getSession(); - Query query = session.getNamedQuery("WebSession.deleteByUserId"); - query.setParameter("user_id", user.getId()); - query.executeUpdate(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } + Session session = HibernateFactory.getSession(); + Query query = session.getNamedQuery("WebSession.deleteByUserId"); + query.setParameter("user_id", user.getId()); + query.executeUpdate(); } }
diff --git a/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java b/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java index 57cd66f..70c71f1 100644 --- a/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java +++ b/java/code/src/com/redhat/rhn/domain/task/TaskFactory.java @@ -19,7 +19,6 @@ import com.redhat.rhn.domain.org.Org;
import org.apache.log4j.Logger; import org.hibernate.Criteria; -import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.criterion.CriteriaSpecification; import org.hibernate.criterion.Order; @@ -82,19 +81,12 @@ public class TaskFactory extends HibernateFactory { * @return Returns the task that matches all three parameters or null. */ public static Task lookup(Org org, String name, Long data) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (Task) session.getNamedQuery("Task.lookup") - .setString("name", name) - .setLong("data", data.longValue()) - .setEntity("org", org) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return (Task) session.getNamedQuery("Task.lookup") + .setString("name", name) + .setLong("data", data.longValue()) + .setEntity("org", org) + .uniqueResult(); }
/** @@ -103,18 +95,11 @@ public class TaskFactory extends HibernateFactory { * @return Returns a list of task objects */ public static List getTaskListByChannel(Org org) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return session.getNamedQuery("Task.lookupByOrgAndName") - .setEntity("org", org) - .setString("name", "update_errata_cache_by_channel") - .list(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return session.getNamedQuery("Task.lookupByOrgAndName") + .setEntity("org", org) + .setString("name", "update_errata_cache_by_channel") + .list(); }
/** diff --git a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java index fdb0843..0d8b965 100644 --- a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java +++ b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java @@ -31,7 +31,6 @@ import com.redhat.rhn.manager.session.SessionManager;
import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.hibernate.HibernateException; import org.hibernate.Query; import org.hibernate.Session;
@@ -83,20 +82,13 @@ public class UserFactory extends HibernateFactory { * @return Returns the appropriate state (or null). */ private static State loadState(String label) { - Session session = null; - try { - session = HibernateFactory.getSession(); - State state = (State) session.getNamedQuery("UserState.lookupByLabel") - .setParameter("label", label) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - return state; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + State state = (State) session.getNamedQuery("UserState.lookupByLabel") + .setParameter("label", label) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); + return state; }
/** @@ -106,25 +98,19 @@ public class UserFactory extends HibernateFactory { * @return the responsible user (first org admin) of the org. */ public static User findResponsibleUser(Long orgId, Role r) { - Session session = null; - try { - session = HibernateFactory.getSession(); - Iterator itr = session.getNamedQuery("User.findResponsibleUser") - .setParameter("org_id", orgId) - .setParameter("type_id", r.getId()) - //Retrieve from cache if there - .list().iterator(); - if (itr.hasNext()) { - // only care about the first one - Object[] row = (Object[])itr.next(); - User u = createUser(); - u.setId((Long) row[0]); - u.setLogin((String)row[1]); - return u; - } - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + Session session = HibernateFactory.getSession(); + Iterator itr = session.getNamedQuery("User.findResponsibleUser") + .setParameter("org_id", orgId) + .setParameter("type_id", r.getId()) + //Retrieve from cache if there + .list().iterator(); + if (itr.hasNext()) { + // only care about the first one + Object[] row = (Object[])itr.next(); + User u = createUser(); + u.setId((Long) row[0]); + u.setLogin((String)row[1]); + return u; } return null; } @@ -136,21 +122,15 @@ public class UserFactory extends HibernateFactory { */ public static User findRandomOrgAdmin(Org orgIn) { Role r = RoleFactory.ORG_ADMIN; - Session session = null; - try { - session = HibernateFactory.getSession(); - Iterator itr = session.getNamedQuery("User.findRandomOrgAdmin") - .setParameter("org_id", orgIn.getId()) - .setParameter("type_id", r.getId()) - //Retrieve from cache if there - .list().iterator(); - if (itr.hasNext()) { - // only care about the first one - return UserFactory.lookupById((Long)itr.next()); - } - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + Session session = HibernateFactory.getSession(); + Iterator itr = session.getNamedQuery("User.findRandomOrgAdmin") + .setParameter("org_id", orgIn.getId()) + .setParameter("type_id", r.getId()) + //Retrieve from cache if there + .list().iterator(); + if (itr.hasNext()) { + // only care about the first one + return UserFactory.lookupById((Long)itr.next()); } return null; } @@ -194,16 +174,9 @@ public class UserFactory extends HibernateFactory { * @return the user found */ public static User lookupById(Long id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - User u = (User)session.get(LegacyRhnUserImpl.class, id); - return u; - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + User u = (User)session.get(LegacyRhnUserImpl.class, id); + return u; }
@@ -520,19 +493,12 @@ public class UserFactory extends HibernateFactory { * @return TimeZone the requested time zone */ public static RhnTimeZone getTimeZone(int id) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (RhnTimeZone) session.getNamedQuery("RhnTimeZone.loadTimeZoneById") - .setInteger("tid", id) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return (RhnTimeZone) session.getNamedQuery("RhnTimeZone.loadTimeZoneById") + .setInteger("tid", id) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); }
/** @@ -541,20 +507,13 @@ public class UserFactory extends HibernateFactory { * @return TimeZone the requested time zone */ public static RhnTimeZone getTimeZone(String olsonName) { - Session session = null; - try { - session = HibernateFactory.getSession(); - return (RhnTimeZone) session - .getNamedQuery("RhnTimeZone.loadTimeZoneByOlsonName") - .setString("ton", olsonName) - //Retrieve from cache if there - .setCacheable(true) - .uniqueResult(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + return (RhnTimeZone) session + .getNamedQuery("RhnTimeZone.loadTimeZoneByOlsonName") + .setString("ton", olsonName) + //Retrieve from cache if there + .setCacheable(true) + .uniqueResult(); }
/** @@ -574,14 +533,8 @@ public class UserFactory extends HibernateFactory { //whereas the database is not. if (timeZoneList == null) { List timeZones = null; //temporary holding place until sorted - Session session = null; - try { - session = HibernateFactory.getSession(); - timeZones = session.getNamedQuery("RhnTimeZone.loadAll").list(); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } + Session session = HibernateFactory.getSession(); + timeZones = session.getNamedQuery("RhnTimeZone.loadAll").list();
//Now sort the timezones. American timezones come first as they are 'preferred' //All other timezones are sorted and placed after American ones. @@ -688,17 +641,9 @@ public class UserFactory extends HibernateFactory { public UserServerPreference lookupServerPreferenceByUserServerAndName(User user, Server server, String name) { - Session session = null; - try { - UserServerPreferenceId id = new UserServerPreferenceId(user, server, name); - session = HibernateFactory.getSession(); - return (UserServerPreference) session.get(UserServerPreference.class, id); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - - return null; + UserServerPreferenceId id = new UserServerPreferenceId(user, server, name); + Session session = HibernateFactory.getSession(); + return (UserServerPreference) session.get(UserServerPreference.class, id); }
/** @@ -713,37 +658,30 @@ public class UserFactory extends HibernateFactory { Server server, String preferenceName, boolean value) { - Session session = null; - try { - UserServerPreferenceId id = new UserServerPreferenceId(user, - server, - preferenceName); - session = HibernateFactory.getSession(); - UserServerPreference usp = (UserServerPreference) - session.get(UserServerPreference.class, id); - - /* Here, we delete the preference's entry if it should be true. - * We would hopefully be ok setting the value to "1," but I'm emulating - * the Perl side here just to be safe - */ - if (value) { - if (usp != null) { - session.delete(usp); - } - } - else { - if (usp == null) { - id = new UserServerPreferenceId(user, server, preferenceName); - usp = new UserServerPreference(); - usp.setId(id); - usp.setValue("0"); - session.save(usp); - } + Session session = HibernateFactory.getSession(); + UserServerPreferenceId id = new UserServerPreferenceId(user, + server, + preferenceName); + UserServerPreference usp = (UserServerPreference) + session.get(UserServerPreference.class, id); + + /* Here, we delete the preference's entry if it should be true. + * We would hopefully be ok setting the value to "1," but I'm emulating + * the Perl side here just to be safe + */ + if (value) { + if (usp != null) { + session.delete(usp); } - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + else { + if (usp == null) { + id = new UserServerPreferenceId(user, server, preferenceName); + usp = new UserServerPreference(); + usp.setId(id); + usp.setValue("0"); + session.save(usp); + } } }
@@ -754,17 +692,10 @@ public class UserFactory extends HibernateFactory { * @return list of users. */ public List<User> findAllUsers(Org inOrg) { - Session session = null; - try { - session = HibernateFactory.getSession(); - Map<String, Object> params = new HashMap<String, Object>(); - params.put("org_id", inOrg.getId()); - return (List<User>)listObjectsByNamedQuery("User.findAllUsersByOrg", params); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + Map<String, Object> params = new HashMap<String, Object>(); + params.put("org_id", inOrg.getId()); + return (List<User>)listObjectsByNamedQuery("User.findAllUsersByOrg", params); }
/** @@ -774,17 +705,10 @@ public class UserFactory extends HibernateFactory { * @return list of users. */ public List<User> findAllOrgAdmins(Org inOrg) { - Session session = null; - try { - session = HibernateFactory.getSession(); - Map<String, Object> params = new HashMap<String, Object>(); - params.put("org_id", inOrg.getId()); - return (List<User>)listObjectsByNamedQuery("User.findAllOrgAdmins", params); - } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); - } - return null; + Session session = HibernateFactory.getSession(); + Map<String, Object> params = new HashMap<String, Object>(); + params.put("org_id", inOrg.getId()); + return (List<User>)listObjectsByNamedQuery("User.findAllOrgAdmins", params); }
}
commit b2b5c1e02e182e79672115bbb9ac823fbcbb22ed Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 11:16:57 2009 -0400
Automatic commit of package [spacewalk-schema] release [0.6.11-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 5515c1a..35a7328 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -0.6.10-1 schema/spacewalk/ +0.6.11-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 3a3957f..31adf3b 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -2,7 +2,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server
-Version: 0.6.10 +Version: 0.6.11 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-schema-upgrade*
%changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.11-1 +- rebuild + * Thu Jun 25 2009 Milan Zazrivec mzazrivec@redhat.com 0.6.10-1 - 506272 - insert sub4v rows only if they do not exist - 431673 - reworking rhnServerNeededView for performance fixes.
commit 26846e62da3dc5c277e78f8b89a96de63eee9ef7 Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 11:09:58 2009 -0400
Automatic commit of package [spacewalk-backend] release [0.6.14-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 363b0e6..350d207 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 0.6.13 +Version: 0.6.14 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -568,7 +568,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$ %changelog -* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.13-1 +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.14-1 - change comments to docstrings (msuchy@redhat.com) - change comments to docstrings (msuchy@redhat.com) - change comments to docstrings (msuchy@redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index fc0fa73..f4be8cc 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.13-1 backend/ +0.6.14-1 backend/
commit 2d5fd4346ea458a8d5371387106e32fb533c038b Author: Pradeep Kilambi pkilambi@redhat.com Date: Thu Jun 25 11:14:20 2009 -0400
fixing indent error
diff --git a/backend/common/rhnRepository.py b/backend/common/rhnRepository.py index fabb781..85e0408 100644 --- a/backend/common/rhnRepository.py +++ b/backend/common/rhnRepository.py @@ -106,7 +106,7 @@ class Repository(RPC_Base):
if redirectsSupported: log_debug(3, "Client supports redirects.") - filePath = self.getPackagePath(pkg_spec, 1) + filePath = self.getPackagePath(pkg_spec, 1) else: #older clients just return the hosted url and download the package filePath = self.getPackagePath(pkg_spec)
commit 7cc7272605a1dc0dbc58e9135fba4f23eea7b0f3 Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 10:52:38 2009 -0400
Automatic commit of package [spacewalk-backend] release [0.6.13-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index c79cddc..363b0e6 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 0.6.12 +Version: 0.6.13 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -568,7 +568,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$ %changelog -* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.12-1 +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.13-1 - change comments to docstrings (msuchy@redhat.com) - change comments to docstrings (msuchy@redhat.com) - change comments to docstrings (msuchy@redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 08b83df..fc0fa73 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.12-1 backend/ +0.6.13-1 backend/
commit d10cf68f0d7d348423d47f1f5d5c7520c9aaf7d2 Author: John Matthews jmatthew@redhat.com Date: Thu Jun 25 10:52:36 2009 -0400
Automatic commit of package [spacewalk-backend] release [0.6.12-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index f6f334c..c79cddc 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -7,7 +7,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 0.6.11 +Version: 0.6.12 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -568,6 +568,62 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$ %changelog +* Thu Jun 25 2009 John Matthews jmatthew@redhat.com 0.6.12-1 +- change comments to docstrings (msuchy@redhat.com) +- change comments to docstrings (msuchy@redhat.com) +- change comments to docstrings (msuchy@redhat.com) +- change comments to docstrings (msuchy@redhat.com) +- change comments to docstrings (msuchy@redhat.com) +- change comments to docstrings (msuchy@redhat.com) +- change comments to docstrings (msuchy@redhat.com) +- change comments to docstrings (msuchy@redhat.com) +- change comments to docstrings (msuchy@redhat.com) +- change comments to docstrings (msuchy@redhat.com) +- 499723 - accept follow-redirects with value greater then 2 + (msuchy@redhat.com) +- change comments to docstrings (msuchy@redhat.com) +- change comments to docstrings (msuchy@redhat.com) +- 507867 - Schedule repo gen once the channel package associations is complete + (pkilambi@redhat.com) +- 505680 - channel_product_id is computed based on the name, product and + version so it will not match the cache as cache is always None. Also dont + update the channel_product_id uless the id is different from whats being + updated (pkilambi@redhat.com) +- Update HACKING file for backend test instructions. (dgoodwin@redhat.com) +- Integrate some PostgreSQL rhnSQL driver unit tests. (dgoodwin@redhat.com) +- First cut of a unit test framework for Python backend. (dgoodwin@redhat.com) +- 507593 - fixing eus registration tracebacks (pkilambi@redhat.com) +- Adding repodata details for a given channel to channelDetails page. + (pkilambi@redhat.com) +- Revert "503090 - Exclude rhnlib from kickstart profile sync." + (dgoodwin@redhat.com) +- remove short package dependency on rpms. User might wanna skip the rpms and + still import metadata. (pkilambi@redhat.com) +- 422611 - Warn that satrm.py is not a supported script. (dgoodwin@redhat.com) +- fixing the unsubscriptable object error when package is not yet in rhnPackage + table (pkilambi@redhat.com) +- 506264 - This commit includes: (pkilambi@redhat.com) +- 505680 - When satsync tries to do an import it compares whats in cache to db + and tries to import only new content, but since the last_modified date always + differ we end up updating the rhnChannel table even when there is nothing to + sync. Adding last_modified to ignore keys list so that we dont decide the + diff based on this field. We still continue to compare the rest of the + fields. (pkilambi@redhat.com) +- 495790 - force uploading a package ends up with duplicate entries in + rhnPackage table. This is because we use md5sum along with name, evr, package + arch and org as a primary key while deciding whether to perform an insert or + an update. Since the solaris packages had same nvrea and org and different + md5 sums it was doing an insert instead of update on the existing row. Fixed + the schema wrapper to only use md5sum as a primary key if nvrea feature is + enabled. Also fixed the package uniquifies to use md5sum only for nvrea. + (pkilambi@redhat.com) +- Catch the systemExit and preserve the error code. Also fixing the traceback + issue when db is not accessible (pkilambi@redhat.com) +- removing bugzilla handler specific tests (pkilambi@redhat.com) +- 502581 - splitting the data to smaller chunks to please cx_oracle to avoid + throwing array too big errors (pkilambi@redhat.com) +- 503090 - Exclude rhnlib from kickstart profile sync. (dgoodwin@redhat.com) + * Fri Jun 05 2009 jesus m. rodriguez jesusr@redhat.com 0.6.11-1 - fixing duplicate entries in repogen tables and other clean aup (pkilambi@redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index f1b09da..08b83df 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -0.6.11-1 backend/ +0.6.12-1 backend/
commit 96465f00e39faca9ebc8a34cec4f98ebeac6a608 Author: Devan Goodwin dgoodwin@redhat.com Date: Thu Jun 25 11:03:37 2009 -0300
Fix mod_jk failure to load.
mod_jk should only be used on RHEL 4, but on Fedora it was trying to be loaded anyhow. This is due to the fact that if mod_version is not loaded at all, the IfVersion tag that protects the mod_jk load is ignored and we load it anyhow. Found that we already load mod_version in zz-spacewalk-www.conf, but this is parsed much later. Moved the mod_version load to 00-spacewalk-mod_jk.conf.
diff --git a/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf b/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf index ed802af..6ed2090 100644 --- a/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf +++ b/spacewalk/config/etc/httpd/conf.d/00-spacewalk-mod_jk.conf @@ -1,3 +1,7 @@ +<IfModule !mod_version.c> +LoadModule version_module modules/mod_version.so +</IfModule> + <IfVersion < 2.1> LoadModule jk_module modules/mod_jk.so </IfVersion> diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf index 930ec30..5f58ea7 100644 --- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf +++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf @@ -61,10 +61,6 @@ AddType text/pxt .pxt Satisfy All </Files>
-<IfModule !mod_version.c> -LoadModule version_module modules/mod_version.so -</IfModule> - <IfVersion >= 2.1> <IfModule !proxy_ajp_module> LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
commit 4ff1e355b5897dba14fa561ddd97cca72042881a Author: Devan Goodwin dgoodwin@redhat.com Date: Thu Jun 25 10:59:09 2009 -0300
Fix server migration when source org has > 1000 org admins.
Oracle was spitting back an error, conveniently swalled by a catch/log in our code (now removed). Modified to batch the query into chunks of 999 if necessary and assembled the results in application code.
This change fixes OrgHandlerTest.testMigrateSystem when run against a db with more than 1000 org admins.
diff --git a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java index 151794e..fdb0843 100644 --- a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java +++ b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java @@ -42,6 +42,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map;
@@ -207,22 +208,41 @@ public class UserFactory extends HibernateFactory {
/** - * Get users by their ids + * Get users by their ids. + * + * If the incoming list has more than 1000 entries, we'll chop it up and run several + * queries, re-assembling the results in application code. This is to accommodate + * Oracle's ORA-01795 error "maximum number of expressions in a list is 1000". + * * @param ids the ids to lookup for * @return the list of com.redhat.rhn.domain.User objects found */ - public static List lookupByIds(Collection ids) { - Session session = null; - try { - session = HibernateFactory.getSession(); - Query query = session.getNamedQuery("User.findByIds") - .setParameterList("userIds", ids); - return query.list(); + public static List lookupByIds(Collection<Long> ids) { + if (ids.size() < 1000) { + return realLookupByIds(ids); } - catch (HibernateException he) { - log.error("Hibernate exception: " + he.toString()); + + List<User> results = new LinkedList<User>(); + List<Long> blockOfIds = new LinkedList<Long>(); + for (Long uid : ids) { + blockOfIds.add(uid); + if (blockOfIds.size() == 999) { + results.addAll(realLookupByIds(blockOfIds)); + blockOfIds = new LinkedList<Long>(); + } } - return null; + // Deal with the remainder: + if (blockOfIds.size() > 0) { + results.addAll(realLookupByIds(blockOfIds)); + } + return results; + } + + private static List<User> realLookupByIds(Collection<Long> ids) { + Session session = HibernateFactory.getSession(); + Query query = session.getNamedQuery("User.findByIds") + .setParameterList("userIds", ids); + return query.list(); }
/** diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.java index d5ce945..64786bf 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/org/test/OrgHandlerTest.java @@ -640,6 +640,7 @@ public class OrgHandlerTest extends BaseHandlerTestCase { OrgFactory.save(newOrgAdmin.getOrg());
Server server = ServerTestUtils.createTestSystem(admin); + assertNotNull(server.getOrg()); List<Integer> servers = new LinkedList<Integer>(); servers.add(new Integer(server.getId().intValue())); // Actual migration is tested internally, just make sure the API call doesn't diff --git a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java index 4d8eafa..146446b 100644 --- a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java +++ b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java @@ -186,7 +186,11 @@ public class MigrationManager extends BaseManager { * @param server Server to be migrated. */ public static void updateAdminRelationships(Org fromOrg, Org toOrg, Server server) { - + // TODO: In some scenarios this appears to be somewhat slow, for an org with + // around a thousand org admins and a dozen or so servers, this can take about a + // minute to run. Probably a much more efficient way to do this. (i.e. delete + // from rhnUserServerPerms where server_id = blah. Add a huge number of servers to + // the mix and it could take quite some time. for (User admin : fromOrg.getActiveOrgAdmins()) { admin.removeServer(server); UserFactory.save(admin);
commit cd5752bb5104f93c4db3ebe5424ef7ed8f53a856 Author: Milan Zazrivec mzazrivec@redhat.com Date: Thu Jun 25 15:01:57 2009 +0200
508064 - fix osad installation errors on client
rpm would print following error messages: warning: user mockbuild does not exist - using root warning: group mockbuild does not exist - using root
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index e746176..b9a6377 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -198,7 +198,7 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvvi {} %{rhnroot}/osad/osad_config.py* %{rhnroot}/osad/rhn_log.py* %{rhnroot}/osad/rhnLockfile.py* -%attr(755,-,-) %{rhnroot}/osad/rhn_fcntl.py* +%attr(755,root,root) %{rhnroot}/osad/rhn_fcntl.py* %config(noreplace) %{_sysconfdir}/sysconfig/rhn/osad.conf %config(noreplace) %attr(600,root,root) %{_sysconfdir}/sysconfig/rhn/osad-auth.conf %config(noreplace) %{client_caps_dir}/*
commit b2c6487021e322401dc85cbc9268b38ccdf0f83e Author: Milan Zazrivec mzazrivec@redhat.com Date: Thu Jun 25 14:10:46 2009 +0200
Automatic commit of package [spacewalk-setup] release [0.6.9-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index 4512a72..87a7464 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -0.6.8-1 spacewalk/setup/ +0.6.9-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index 1abf415..a7cf6c2 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk
@@ -100,6 +100,20 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/pki/spacewalk/jabberd
%changelog +* Thu Jun 25 2009 Milan Zazrivec mzazrivec@redhat.com 0.6.9-1 +- no in-place editing of /etc/oratab under oracle user (mzazrivec@redhat.com) +- remove extraneous backslash characters (mzazrivec@redhat.com) +- update records in /etc/oratab in db upgrade scripts (mzazrivec@redhat.com) +- 507338 - Fixed a spacewalk setup glitch where we not checkking for a null + value.. (paji@redhat.com) +- support for db upgrade with custom user set (mzazrivec@redhat.com) +- set new embedded db oratab entry only if it does not exist + (mzazrivec@redhat.com) +- restart the satellite using shell script (mzazrivec@redhat.com) +- Do not start embedded db during upgrade (mzazrivec@redhat.com) +- 506405 - fixed cobbler-setup for non-interactive installs (paji@redhat.com) +- 499889 - Modified cobbler-setup to turn on tftp and xinetd (paji@redhat.com) + * Fri Jun 05 2009 jesus m. rodriguez jesusr@redhat.com 0.6.8-1 - no need to enable Monitoring + MonitoringScout explicitly (mzazrivec@redhat.com) - Fixes to support mod_jk >= 2.2.26. (dgoodwin@redhat.com)
commit ea412a7c1af426d8cbe491dc1af504c3f45c07bc Author: Milan Zazrivec mzazrivec@redhat.com Date: Thu Jun 25 14:08:54 2009 +0200
Automatic commit of package [spacewalk-schema] release [0.6.10-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 31a1432..5515c1a 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -0.6.9-1 schema/spacewalk/ +0.6.10-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index 3c79a3c..3a3957f 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -2,7 +2,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server
-Version: 0.6.9 +Version: 0.6.10 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz
@@ -52,6 +52,13 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-schema-upgrade*
%changelog +* Thu Jun 25 2009 Milan Zazrivec mzazrivec@redhat.com 0.6.10-1 +- 506272 - insert sub4v rows only if they do not exist +- 431673 - reworking rhnServerNeededView for performance fixes. + (mmccune@gmail.com) +- 492588 - Provide for shared child channels with non-shared parent channels + (jortel@redhat.com) + * Fri Jun 05 2009 jesus m. rodriguez jesusr@redhat.com 0.6.9-1 - 503243 - Dropping the is_default column as we now determine the default in the app code based on the compatible eus channel instead of jus the default.
commit 932b2a771f844b1b1920e9b17f6bec1202720797 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jun 24 11:44:38 2009 +0200
change comments to docstrings
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py index 2ab73aa..9924917 100644 --- a/proxy/proxy/rhnShared.py +++ b/proxy/proxy/rhnShared.py @@ -167,7 +167,7 @@ class SharedHandler: return apply(conn_class, (), params)
def _parse_url(self, url): - # Returns scheme, host, port, path + """ Returns scheme, host, port, path. """ scheme, netloc, path, params, query, frag = rhnLib.parseUrl(url) host, port = urllib.splitnport(netloc) if (port <= 0): @@ -217,7 +217,7 @@ class SharedHandler: return self._handleServerResponse(status)
def _handleServerResponse(self, status): - """ This method can be overridden by subclasses who want to handle server + """ This method can be overridden by subclasses who want to handle server responses in their own way. By default, we will wrap all the headers up and send them back to the client with an error status. This method should return apache.OK if everything went according to plan. @@ -284,7 +284,7 @@ class SharedHandler: # --- PROTECTED METHODS ---
def _getHeaders(self, req): - #""" Copy the incoming headers. """ + """ Copy the incoming headers. """
hdrs = UserDictCase() for k in req.headers_in.keys(): @@ -426,5 +426,3 @@ class SharedHandler: except IOError: buf = 0
-#=============================================================================== -
commit 007ddaa2a238f132cd785fe08764271de4b3b075 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jun 24 11:43:23 2009 +0200
change comments to docstrings
diff --git a/proxy/proxy/broker/rhnRepository.py b/proxy/proxy/broker/rhnRepository.py index 61a676a..454518d 100644 --- a/proxy/proxy/broker/rhnRepository.py +++ b/proxy/proxy/broker/rhnRepository.py @@ -44,9 +44,7 @@ class NotLocalError(Exception): pass
-# Class to access rhn-proxy's local package repository. class Repository(rhnRepository.Repository): - """ Proxy local package repository lookup and manipulation code. """
def __init__(self, @@ -82,10 +80,10 @@ class Repository(rhnRepository.Repository): # If the file name has parameters, it's a different kind of package. # Determine the architecture requested so we can construct an # appropriate filename. - if type(pkgFilename) == types.ListType: + if type(pkgFilename) == types.ListType: arch = pkgFilename[3] if isSolarisArch(arch): - pkgFilename = "%s-%s-%s.%s.pkg" % \ + pkgFilename = "%s-%s-%s.%s.pkg" % \ (pkgFilename[0], pkgFilename[1], pkgFilename[2], @@ -151,15 +149,15 @@ class Repository(rhnRepository.Repository): return filePath
def _cacheObj(self, fileName, version, dataProducer, params=None): - #""" The real workhorse for all flavors of listall - # It tries to pull data out of a file; if it doesn't work, - # it calls the data producer with the specified params to generate - # the data, which is also cached. - # - # Returns a string from a cache file or, if the cache file is not - # there, calls dataProducer to generate the object and caches the - # results - #""" + """ The real workhorse for all flavors of listall + It tries to pull data out of a file; if it doesn't work, + it calls the data producer with the specified params to generate + the data, which is also cached. + + Returns a string from a cache file or, if the cache file is not + there, calls dataProducer to generate the object and caches the + results + """
log_debug(4, fileName, version, params) fileDir = self._getPkgListDir() @@ -182,12 +180,12 @@ class Repository(rhnRepository.Repository): return stringObject
def _getPkgListDir(self): - #""" Creates and returns the directory for cached lists of packages. - # Used by _cacheObj. - # - # XXX: Problem exists here. If PKG_LIST_DIR can't be created - # due to ownership... this is bad... need to fix. - #""" + """ Creates and returns the directory for cached lists of packages. + Used by _cacheObj. + + XXX: Problem exists here. If PKG_LIST_DIR can't be created + due to ownership... this is bad... need to fix. + """
log_debug(3, PKG_LIST_DIR) if not os.access(PKG_LIST_DIR, os.R_OK | os.X_OK): @@ -195,7 +193,7 @@ class Repository(rhnRepository.Repository): return PKG_LIST_DIR
def __channelPackageMapping(self): - #""" fetch package list on behalf of the client """ + """ fetch package list on behalf of the client """
log_debug(6, self.rhnParentXMLRPC, self.httpProxy, self.httpProxyUsername, self.httpProxyPassword) log_debug(6, self.clientInfo) @@ -233,7 +231,7 @@ def isSolarisArch(arch): return arch.find("solaris") != -1
def listPackages(function, channel, version): - #""" Generates a list of objects by calling the function """ + """ Generates a list of objects by calling the function """
try: return function(channel, version) @@ -244,7 +242,7 @@ def listPackages(function, channel, version):
def computePackagePath(nvrea, source=0, prepend=""): - # """ Finds the appropriate path, prepending something if necessary """ + """ Finds the appropriate path, prepending something if necessary """
name = nvrea[0] release = nvrea[2] @@ -274,9 +272,9 @@ def computePackagePath(nvrea, source=0, prepend=""): # reg exp for splitting package names. re_rpmName = re.compile("^(.*)-([^-]*)-([^-]*)$") def parseRPMName(pkgName): - #""" IN: Package string in, n-n-n-v.v.v-r.r_r, format. - # OUT: Four strings (in a list): name, release, version, epoch. - #""" + """ IN: Package string in, n-n-n-v.v.v-r.r_r, format. + OUT: Four strings (in a list): name, release, version, epoch. + """
reg = re_rpmName.match(pkgName) if reg == None: @@ -292,7 +290,7 @@ def parseRPMName(pkgName):
def cache(stringObject, dir, filename, version): - #""" Caches stringObject into a file and removes older files """ + """ Caches stringObject into a file and removes older files """
# The directory should be readable, writable, seekable if not os.access(dir, os.R_OK | os.W_OK | os.X_OK): @@ -333,5 +331,3 @@ def cache(stringObject, dir, filename, version): # Older than this os.unlink(_file)
-#------------------------------------------------------------------------------- -
commit 9043974b2b4ff7966642f44e5f78afb37bedec6c Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jun 24 11:38:14 2009 +0200
change comments to docstrings
diff --git a/backend/server/handlers/xmlrpc/getMethod.py b/backend/server/handlers/xmlrpc/getMethod.py index 054a735..f8f1f16 100644 --- a/backend/server/handlers/xmlrpc/getMethod.py +++ b/backend/server/handlers/xmlrpc/getMethod.py @@ -32,9 +32,7 @@ class GetMethodException(Exception):
def sanity(methodNameComps): - #""" - # Verifies if all the components have proper names - #""" + """ Verifies if all the components have proper names.""" # Allowed characters in each string alpha = string.lowercase + string.uppercase allowedChars = alpha + string.digits + '_' @@ -52,10 +50,9 @@ def sanity(methodNameComps):
def getMethod(methodName, abspath, baseClass): - #""" - #Retreive method given methodName, path to base of tree, and class/module - #route/label. - #""" + """ Retreive method given methodName, path to base of tree, and class/module + route/label. + """ # First split the method name methodNameComps = string.split(baseClass, '.') + string.split(methodName, '.') # Sanity checks
commit 7fa3e3364d8727e3345637e86cf3d18b6cdacfa8 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jun 24 11:36:38 2009 +0200
change comments to docstrings
diff --git a/backend/server/rhnDependency.py b/backend/server/rhnDependency.py index f728fbf..10585ed 100644 --- a/backend/server/rhnDependency.py +++ b/backend/server/rhnDependency.py @@ -299,8 +299,8 @@ class IncompleteLimitInfo(SolveDependenciesError): class MakeEvrError(SolveDependenciesError): pass
-# Now run one of those queries and return the results def __single_query(server_id, deps, query): + """ Now run one of those queries and return the results. """ ret = {} # first prepare the statement h = rhnSQL.prepare(query) @@ -310,8 +310,8 @@ def __single_query(server_id, deps, query): ret[dep] = map(lambda a: a[:4], data) return ret
-#Run one of the queries and return the results along with the arch. def __single_query_with_arch_and_id(server_id, deps, query): + """ Run one of the queries and return the results along with the arch. """ ret = {} h = rhnSQL.prepare(query) for dep in deps: @@ -320,9 +320,10 @@ def __single_query_with_arch_and_id(server_id, deps, query): ret[dep] = map(lambda a: a[:6], data) return ret
-# IN: 'e:name-version-release' or 'name-version-release:e' -# OUT: {'name':name, 'version':version, 'release':release, 'epoch':epoch } def make_evr(nvre): + """ IN: 'e:name-version-release' or 'name-version-release:e' + OUT: {'name':name, 'version':version, 'release':release, 'epoch':epoch } + """ epoch = '' name = '' version = '' @@ -398,28 +399,26 @@ def find_by_files_all(server_id, deps): log_debug(4, server_id, deps) return __single_query(server_id, deps, __files_all_sql)
- - -#This version of solve_dependencies allows the caller to get all of the packages that solve a dependency and limit -#the packages that are returned to those that match the criteria defined by limit_operator and limit. This version -#of the function also returns the architecture label of the package[s] that get returned. -# -#limit_operator can be any of: '<', '<=', '==', '>=', or '>'. -#limit is a a string of the format [epoch:]name-version-release -#deps is a list of filenames that the packages that are returned must provide. -#version is the version of the client that is calling the function. def solve_dependencies_with_limits(server_id, deps, version, all = 0, limit_operator=None, limit = None): - - #Indexes for the tuple - #entry_index = 0 - #preference_index = 1 - - #Indexes for the list of package fields. - #name_index = 0 - #version_index = 1 - #release_index = 2 - #epoch_index = 3 - + """ This version of solve_dependencies allows the caller to get all of the packages that solve a dependency and limit + the packages that are returned to those that match the criteria defined by limit_operator and limit. This version + of the function also returns the architecture label of the package[s] that get returned. + + limit_operator can be any of: '<', '<=', '==', '>=', or '>'. + limit is a a string of the format [epoch:]name-version-release + deps is a list of filenames that the packages that are returned must provide. + version is the version of the client that is calling the function. + + Indexes for the tuple + entry_index = 0 + preference_index = 1 + + Indexes for the list of package fields. + name_index = 0 + version_index = 1 + release_index = 2 + epoch_index = 3 + """ #Containers used while the packages get categorized, sorted, and filtered. packages_all = {} package_list = [] @@ -562,27 +561,28 @@ def solve_dependencies_with_limits(server_id, deps, version, all = 0, limit_oper result.append(r) return result
-#Does the same thing as solve_dependencies, but also returns the architecture label with the package info. -#IN: -# server_id := id info of the server -# deps := list of filenames that are needed by the caller -# version := version of the client -# -#OUT: -# Dictionary with key values being the filnames in deps and the values being a list of lists of package info. -# Example := {'filename1' : [['name', 'version', 'release', 'epoch', 'architecture'], -# ['name2', 'version2', 'release2', 'epoch2', 'architecture2']]} def solve_dependencies_arch(server_id, deps, version): - #Indexes for the tuple stored as the value in dict - #entry_index = 0 - #preference_index = 1 - - #indexes for the list nvre - #name_index = 0 - #version_index = 1 - #release_index = 2 - #epoch_index = 3 - + """ Does the same thing as solve_dependencies, but also returns the architecture label with the package info. + IN: + server_id := id info of the server + deps := list of filenames that are needed by the caller + version := version of the client + + OUT: + Dictionary with key values being the filnames in deps and the values being a list of lists of package info. + Example := {'filename1' : [['name', 'version', 'release', 'epoch', 'architecture'], + ['name2', 'version2', 'release2', 'epoch2', 'architecture2']]} + + Indexes for the tuple stored as the value in dict + entry_index = 0 + preference_index = 1 + + indexes for the list nvre + name_index = 0 + version_index = 1 + release_index = 2 + epoch_index = 3 + """ #list of the keys to the values in each row of the recordset. nvre = ['name', 'version', 'release', 'epoch', 'arch']
@@ -666,17 +666,18 @@ def solve_dependencies_arch(server_id, deps, version): result.append(r) return result
-#the unchanged version of solve_dependencies. -#IN: -# server_id := id info of the server -# deps := list of filenames that are needed by the caller -# version := version of the client -# -#OUT: -# Dictionary with key values being the filnames in deps and the values being a list of lists of package info. -# Example := {'filename1' : [['name', 'version', 'release', 'epoch'], -# ['name2', 'version2', 'release2', 'epoch2']]} def solve_dependencies(server_id, deps, version): + """ The unchanged version of solve_dependencies. + IN: + server_id := id info of the server + deps := list of filenames that are needed by the caller + version := version of the client + + OUT: + Dictionary with key values being the filnames in deps and the values being a list of lists of package info. + Example := {'filename1' : [['name', 'version', 'release', 'epoch'], + ['name2', 'version2', 'release2', 'epoch2']]} + """ # first, uniquify deps deplist = [] for dep in deps: @@ -749,10 +750,10 @@ def solve_dependencies(server_id, deps, version):
-#Intended to be passed to a list object's sort(). -#In: {'epoch': 'value', 'version':'value', 'release':'value'} def cmp_evr(pkg1, pkg2): - + """ Intended to be passed to a list object's sort(). + In: {'epoch': 'value', 'version':'value', 'release':'value'} + """ pkg1_epoch = pkg1['epoch'] pkg1_version = pkg1['version'] pkg1_release = pkg1['release'] @@ -774,13 +775,14 @@ def cmp_evr(pkg1, pkg2): return rpm.labelCompare((pkg1_epoch, pkg1_version, pkg1_release), (pkg2_epoch, pkg2_version, pkg2_release))
-#Check to see if evr is within the limit. -#IN: evr = { 'epoch' : value, 'version':value, 'release':value } -# operator can be any of: '<', '<=', '==', '>=', '>' -# limit = { 'epoch' : value, 'version':value, 'release':value } -#OUT: -# 1 or 0 def test_evr(evr, operator, limit): + """ Check to see if evr is within the limit. + IN: evr = { 'epoch' : value, 'version':value, 'release':value } + operator can be any of: '<', '<=', '==', '>=', '>' + limit = { 'epoch' : value, 'version':value, 'release':value } + OUT: + 1 or 0 + """ good_operators = ['<', '<=', '==', '>=', '>']
if not operator in good_operators:
commit d0045e977c5a286adb9628b1888224f369acef35 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jun 24 11:28:45 2009 +0200
change comments to docstrings
diff --git a/backend/server/handlers/xmlrpc/up2date.py b/backend/server/handlers/xmlrpc/up2date.py index 5dbc832..d09e5c0 100644 --- a/backend/server/handlers/xmlrpc/up2date.py +++ b/backend/server/handlers/xmlrpc/up2date.py @@ -33,17 +33,16 @@ from server import rhnChannel, rhnHandler, rhnPackage, rhnDependency,\ rhnCapability from server.rhnServer import server_route
-# -# Up2date Class - xml-rpc Server Functions that we will provide for the -# outside world. class Up2date(rhnHandler): + """ xml-rpc Server Functions that we will provide for the outside world. + """ def __init__(self): - #"""Up2date Class Constructor - # - # o Initializes inherited class. - # o Appends the functions available to the outside world in the - # rhnHandler list. - #""" + """ Up2date Class Constructor + + o Initializes inherited class. + o Appends the functions available to the outside world in the + rhnHandler list. + """ rhnHandler.__init__(self) # Function list inherited from rhnHandler # This action garners control of what is available to the client. @@ -68,13 +67,12 @@ class Up2date(rhnHandler): self.functions.append('solveDependencies_arch') self.functions.append('solveDependencies_with_limits')
- - # Clients v2+ - # Log in routine. def login(self, system_id, extra_data={}): - #"""Return a dictionary of session token/channel information. - # Also sets this information in the headers. - #""" + """ Clients v2+ + Log in routine. + Return a dictionary of session token/channel information. + Also sets this information in the headers. + """ log_debug(5, system_id) # Authenticate the system certificate. We need the user record # to generate the tokens @@ -146,8 +144,8 @@ class Up2date(rhnHandler): return loginDict
- # Clients v2+ def listChannels(self, system_id): + """ Clients v2+ """ log_debug(5, system_id) # Stuff the action in the headers: transport = rhnFlags.get('outputTransportOptions') @@ -160,8 +158,8 @@ class Up2date(rhnHandler): return channelList
- # Clients v2+ def subscribeChannels(self, system_id, channelNames, username, passwd): + """ Clients v2+ """ log_debug(5, system_id, channelNames, username, passwd) # Stuff the action in the headers: transport = rhnFlags.get('outputTransportOptions') @@ -176,8 +174,8 @@ class Up2date(rhnHandler): return 0
- # Clients v2+ def unsubscribeChannels(self, system_id, channelNames, username, passwd): + """ Clients v2+ """ log_debug(3) # Stuff the action in the headers: transport = rhnFlags.get('outputTransportOptions') @@ -192,12 +190,12 @@ class Up2date(rhnHandler): return 0
- # Clients v1- - # Package listing in [[n,v,r,e],...] format. def listall(self, system_id): - #""" - # NOTE: format weirdness: epoch returned is either an integer or ''. - #""" + """ Clients v1- + Package listing in [[n,v,r,e],...] format. + + NOTE: format weirdness: epoch returned is either an integer or ''. + """ log_debug(5, system_id) # Authenticate the system certificate self.auth_system(system_id) @@ -209,13 +207,13 @@ class Up2date(rhnHandler): # and now call into rhnChannel to find the data return rhnChannel.list_packages_for_server(self.server_id)
- # Clients v1- - # Package listing in [[n,v,r,e,s],...] format. def listall_size(self, system_id): - #""" - # NOTE: format weirdness: epoch returned is either an integer or ''. - # size is an integer. - #""" + """ Clients v1- + Package listing in [[n,v,r,e,s],...] format. + + NOTE: format weirdness: epoch returned is either an integer or ''. + size is an integer. + """ log_debug(5, system_id) # Authenticate the system certificate self.auth_system(system_id) @@ -228,16 +226,16 @@ class Up2date(rhnHandler): return rhnChannel.list_packages_for_server(self.server_id, need_size = 1)
- # Clients v1- def header(self, system_id, pkgList): - #""" - #IN: system_id: .... - # a package identifier (or a list of them) - # [n,v,r,e] or - # [[n,v,r,e],...] - #OUT: If Proxy: - # If Client: - #""" + """ Clients v1- + + IN: system_id: .... + a package identifier (or a list of them) + [n,v,r,e] or + [[n,v,r,e],...] + OUT: If Proxy: + If Client: + """ log_debug(5, system_id, pkgList) if type(pkgList) not in (ListType, TupleType) or not len(pkgList): log_error("Invalid package list spec", type(pkgList), @@ -287,9 +285,10 @@ class Up2date(rhnHandler): return rpmHeaders
- # Clients v1- - # Get rpm package. def package(self, system_id, package): + """ Clients v1- + Get rpm package. + """ log_debug(5, "Begin", package)
# Have package in canonical form @@ -312,9 +311,10 @@ class Up2date(rhnHandler): return rpclib.File(open(filePath, "r"), name=filePath)
- # Clients v1- - # Get a source rpm package. def source_package(self, system_id, package): + """ Clients v1- + Get a source rpm package. + """ log_debug(5, "Begin", package)
# Have package in canonical form @@ -337,11 +337,11 @@ class Up2date(rhnHandler): return rpclib.File(open(filePath, "r"), name=filePath)
- # Clients v1- - # Get a source rpm package by its human readable filename. def source_package_by_name(self, system_id, filename): - #"""Just like source_package, but we get a package by filename. - #""" + """ Clients v1- + Get a source rpm package by its human readable filename. + Just like source_package, but we get a package by filename. + """ log_debug(5, "Begin", filename)
# Authenticate the system certificate and set the QoS data @@ -361,58 +361,57 @@ class Up2date(rhnHandler): return rpclib.File(open(filePath, "r"), name=filePath)
- # Clients v1- - # Solve dependencies for a given dependency problem list. def solvedep(self, system_id, deps): - #""" - #IN: a dependency problem list: [name, name, name, ...] - #RET: a package list: [[n,v,r,e],[n,v,r,e],...] That solves the - # dependencies. - #""" + """ Clients v1- + Solve dependencies for a given dependency problem list. + IN: a dependency problem list: [name, name, name, ...] + RET: a package list: [[n,v,r,e],[n,v,r,e],...] That solves the + dependencies. + """ log_debug(4, system_id) return self.__solveDep(system_id, deps, action = "solvedep", clientVersion = 1)
- # Clients v2+ - # Solve dependencies for a given dependency problem list (newer version) def solveDependencies(self, system_id, deps): - #""" - #IN: a dependency problem list: [name, name, name, ...] - #RET: a hash {name: [[n, v, r, e], [n, v, r, e], ...], ...} - #""" + """ Clients v2+ + Solve dependencies for a given dependency problem list (newer version) + IN: a dependency problem list: [name, name, name, ...] + RET: a hash {name: [[n, v, r, e], [n, v, r, e], ...], ...} + """ log_debug(4, system_id) return self.__solveDep(system_id, deps, action = "solvedep", clientVersion = 2)
- #Does the same thing as solve_dependencies, but also returns the architecture label with the - #package info. def solveDependencies_arch(self, system_id, deps): - #""" - #IN: a dependency problem list: [name, name, name, ...] - #RET: a hash {name: [[n, v, r, e, a], [n, v, r, e, a], ...], ...} - #""" + """ Does the same thing as solve_dependencies, but also returns the architecture label with the + package info. + IN: a dependency problem list: [name, name, name, ...] + RET: a hash {name: [[n, v, r, e, a], [n, v, r, e, a], ...], ...} + """ log_debug(4, system_id) return self.__solveDep_arch(system_id, deps, action = "solvedep", clientVersion = 2)
- #This version of solve_dependencies allows the caller to get all of the packages that solve a - #dependency and limit the packages that are returned to those that match the criteria defined - #by limit_operator and limit. This version of the function also returns the architecture label - #of the package[s] that get returned. - # - #limit_operator can be any of: '<', '<=', '==', '>=', or '>'. - #limit is a a string of the format [epoch:]name-version-release - #deps is a list of filenames that the packages that are returned must provide. - #version is the version of the client that is calling the function. def solveDependencies_with_limits(self, system_id, deps, all=0, limit_operator = None, limit = None): + """ This version of solve_dependencies allows the caller to get all of the packages that solve a + dependency and limit the packages that are returned to those that match the criteria defined + by limit_operator and limit. This version of the function also returns the architecture label + of the package[s] that get returned. + + limit_operator can be any of: '<', '<=', '==', '>=', or '>'. + limit is a a string of the format [epoch:]name-version-release + deps is a list of filenames that the packages that are returned must provide. + version is the version of the client that is calling the function. + """ log_debug(4, system_id) return self.__solveDep_with_limits( system_id, deps, action = "solvedep", clientVersion = 2, all=all, limit_operator=limit_operator, limit=limit)
- # Clients v2+ - # Add a history log for a performed action def history(self, system_id, summary, body = ""): + """ Clients v2+ + Add a history log for a performed action + """ log_debug(5, system_id, summary, body) # Authenticate the system certificate server = self.auth_system(system_id) @@ -430,9 +429,10 @@ class Up2date(rhnHandler): # --- PRIVATE METHODS ---
def __solveDep(self, system_id, deps, action, clientVersion): - # Response for clients: - # version 1: list - # version 2: hash + """ Response for clients: + version 1: list + version 2: hash + """ log_debug(5, system_id, deps, action, clientVersion) faultString = _("Invalid value %s (%s)") if type(deps) not in (ListType, TupleType): @@ -460,9 +460,10 @@ class Up2date(rhnHandler): return result
def __solveDep_arch(self, system_id, deps, action, clientVersion): - # Response for clients: - # version 1: list - # version 2: hash + """ Response for clients: + version 1: list + version 2: hash + """ log_debug(5, system_id, deps, action, clientVersion) faultString = _("Invalid value %s (%s)") if type(deps) not in (ListType, TupleType): @@ -491,9 +492,10 @@ class Up2date(rhnHandler):
def __solveDep_with_limits(self, system_id, deps, action, clientVersion, all=0, limit_operator=None, limit=None): - # Response for clients: - # version 1: list - # version 2: hash + """ Response for clients: + version 1: list + version 2: hash + """ log_debug(5, system_id, deps, action, clientVersion) faultString = _("Invalid value %s (%s)") if type(deps) not in (ListType, TupleType): @@ -520,14 +522,15 @@ class Up2date(rhnHandler): transport['X-RHN-Action'] = action return result
-# Check for a package spec correctness -# Each package should be a list or a tuple of three or four members, -# name, version, release, [epoch] -# in case of lack of epoch we assume "" string -# WARNING: we need to make sure we bound ALL values as strings because -# the lack of epoch is suggested by the empty string (''), which is going -# to cause problems if epoch gets bound as an integer def check_package_spec(package): + """ Check for a package spec correctness + Each package should be a list or a tuple of three or four members, + name, version, release, [epoch] + in case of lack of epoch we assume "" string + WARNING: we need to make sure we bound ALL values as strings because + the lack of epoch is suggested by the empty string (''), which is going + to cause problems if epoch gets bound as an integer. + """ # This one checks for sane values for name, version, release def __check_Int_String(name, value, package = package): if type(value) not in (StringType, IntType): @@ -564,23 +567,20 @@ def check_package_spec(package): return [name, version, release, epoch]
-# A class to handle the site selection... class Servers(rhnHandler): + """ A class to handle the site selection... """ def __init__(self): - #"""Servers Class Constructor - #""" + """Servers Class Constructor. """ rhnHandler.__init__(self) self.functions.append('get') self.functions.append('list')
- # older funtion that can be a noop def get(self, *junk): + """ Older funtion that can be a noop. """ return []
- # Available servers the client can connect to def list(self, systemid=None): - #"""Returns a list of available servers the client can connect to - #""" + """ Returns a list of available servers the client can connect to. """ servers_list = [ { 'server' : 'xmlrpc.rhn.redhat.com',
commit 6368d3279dadc26a314c11b231aedc8e4d3e7231 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jun 24 11:09:27 2009 +0200
change comments to docstrings
diff --git a/backend/server/handlers/xmlrpc/queue.py b/backend/server/handlers/xmlrpc/queue.py index 402b9ad..21cfa90 100644 --- a/backend/server/handlers/xmlrpc/queue.py +++ b/backend/server/handlers/xmlrpc/queue.py @@ -32,12 +32,11 @@ from server.rhnServer import server_kickstart
import getMethod
-# -# XMLRPC queue functions that we will provide for the outside world -# class Queue(rhnHandler): - # Add a list of functions we are willing to server out + """ XMLRPC queue functions that we will provide for the outside world. """ + def __init__(self): + """ Add a list of functions we are willing to server out. """ rhnHandler.__init__(self) self.functions.append('get') self.functions.append('length') @@ -51,9 +50,9 @@ class Queue(rhnHandler): }, }
- # Fetches old queued actions for the client version 1 def __getV1(self, action): - log_debug(3, self.server_id) + """ Fetches old queued actions for the client version 1. """ + log_debug(3, self.server_id) actionId = action['id'] method = action["method"] if method == 'packages.update': @@ -70,9 +69,9 @@ class Queue(rhnHandler): # all good return {'id': actionId, 'version': 1, 'action': xml}
- # Fetches queued actions for the clients version 2+ def __getV2(self, action): - log_debug(3, self.server_id) + """ Fetches queued actions for the clients version 2+. """ + log_debug(3, self.server_id) # Get the root dir of this install rootDir = rhnFlags.get("RootDir") if not rootDir: @@ -102,16 +101,17 @@ class Queue(rhnHandler): 'version' : action['version'], }
- - # update the runnng kernel and the last boot values for this - # server from the status dictionary passed on queue checkin def __update_status(self, status): - # record last running kernel and uptime. only update - # last_boot if it has changed by more than five minutes. we - # don't know the timezone the server is in. or even if its - # clock is right, but we do know it can properly track seconds - # since it rebooted, and use our own clocks to keep proper - # track of the actual time + """ Update the runnng kernel and the last boot values for this + server from the status dictionary passed on queue checkin. + + Record last running kernel and uptime. Only update + last_boot if it has changed by more than five minutes. We + don't know the timezone the server is in. or even if its + clock is right, but we do know it can properly track seconds + since it rebooted, and use our own clocks to keep proper + track of the actual time. + """
if status.has_key('uname'): kernelver = status['uname'][2] @@ -142,7 +142,7 @@ class Queue(rhnHandler): def __should_snapshot(self): log_debug(4, self.server_id, "determining whether to snapshot...")
- entitlements = self.server.check_entitlement() + entitlements = self.server.check_entitlement() if not entitlements.has_key("provisioning_entitled"): return 0
@@ -217,7 +217,7 @@ class Queue(rhnHandler): else: self.update_checkin = 1 self.auth_system(system_id) - log_debug(1, self.server_id, version, + log_debug(1, self.server_id, version, "checkins %s" % ["disabled", "enabled"][self.update_checkin]) if status: self.__update_status(status) @@ -321,30 +321,29 @@ class Queue(rhnHandler):
return ret
- # submit the results of a queue run def submit(self, system_id, action_id, result, message="", data={}): - #""" - # maps old and new rhn_check behavior to new database status codes - # - # The new API uses 4 slightly different status codes than the - # old client does. This function will "hopefully" sensibly - # map them. Old methodology: - # -rhn_check retrieves an action from the top of the action queue. - # -It attempts to execute the desired action and returns either - # (a) 0 -- presumed successful. - # (b) rhnFault object -- presumed failed - # (c) some other non-fault object -- *assumed* successful. - # -Regardless of result code, action is marked as "executed" - # - # We try to make a smarter status selection (i.e. failed||completed). - # - # For reference: - # New DB status codes: Old DB status codes: - # 0: Queued 0: queued - # 1: Picked Up 1: picked up - # 2: Completed 2: executed - # 3: Failed 3: completed - #""" + """ Submit the results of a queue run. + Maps old and new rhn_check behavior to new database status codes + + The new API uses 4 slightly different status codes than the + old client does. This function will "hopefully" sensibly + map them. Old methodology: + -rhn_check retrieves an action from the top of the action queue. + -It attempts to execute the desired action and returns either + (a) 0 -- presumed successful. + (b) rhnFault object -- presumed failed + (c) some other non-fault object -- *assumed* successful. + -Regardless of result code, action is marked as "executed" + + We try to make a smarter status selection (i.e. failed||completed). + + For reference: + New DB status codes: Old DB status codes: + 0: Queued 0: queued + 1: Picked Up 1: picked up + 2: Completed 2: executed + 3: Failed 3: completed + """ if type(action_id) is not IntType: # Convert it to int try: @@ -428,11 +427,12 @@ class Queue(rhnHandler): rhnSQL.commit() return 0
- # Convert whatever the client sends as a result code into a status in the - # database format - # This is more complicated, since some of the client's result codes have - # to be marked as successes def status_for_action_type_code(self, action_type, rcode): + """ Convert whatever the client sends as a result code into a status in the + database format + This is more complicated, since some of the client's result codes have + to be marked as successes. + """ log_debug(4, action_type, rcode) if rcode == 0: # Completed @@ -474,8 +474,8 @@ class Queue(rhnHandler): result = method(self.server_id, action_id, data=data) return result
- # return the queue length for a certain server def length(self, system_id): + """ Return the queue length for a certain server. """ # Authenticate the system certificate self.auth_system(system_id) log_debug(1, self.server_id) @@ -496,18 +496,17 @@ class Queue(rhnHandler):
### PRIVATE methods
- # update the status of an action def __update_action(self, action_id, status, resultCode = None, message = ""): + """ Update the status of an action. """ log_debug(4, action_id, status, resultCode, message) rhnAction.update_server_action(server_id=self.server_id, action_id=action_id, status=status, result_code=resultCode, result_message=message) return 0
- - # Old client errata retrieval def __errataUpdate(self, actionId): + """ Old client errata retrieval. """ log_debug(3, self.server_id, actionId) # get the names of the packages associated with each errata and # look them up in channels subscribed to by the server and select @@ -564,8 +563,8 @@ class Queue(rhnHandler): xml = xmlrpclib.dumps((packages,), methodname='client.update_packages') return xml
- # Old client package retrieval def __packageUpdate(self, actionId): + """ Old client package retrieval. """ log_debug(3, self.server_id, actionId) # The SQL query is a union of: # - packages with a specific EVR
commit 5ad0a2b9844b3ab2bcd1635c17b80e3cc6680aaf Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jun 24 11:01:57 2009 +0200
change comments to docstrings
diff --git a/backend/server/handlers/xmlrpc/errata.py b/backend/server/handlers/xmlrpc/errata.py index 5a74109..f224891 100644 --- a/backend/server/handlers/xmlrpc/errata.py +++ b/backend/server/handlers/xmlrpc/errata.py @@ -23,8 +23,8 @@ from common import rhnFault, rhnFlags, log_debug, log_error from server.rhnLib import parseRPMName from server import rhnSQL, rhnHandler, rhnCapability
-# Errata class --- retrieve (via xmlrpc) package errata. class Errata(rhnHandler): + """ Errata class --- retrieve (via xmlrpc) package errata. """ def __init__(self): rhnHandler.__init__(self) # Exposed Errata functions: @@ -33,17 +33,15 @@ class Errata(rhnHandler): self.functions.append('getPackageErratum') # Clients v2+ self.functions.append('getErrataInfo') # clients v2+
- # Clients v1- - # Get errata for a package given "n-v-r" format def GetByPackage(self, pkg, osRel): - #""" - #IN: pkg: "n-v-r" (old client call) - # or [n,v,r] - # osRel: OS release - #RET: a hash by errata that applies to this package - # (ie, newer packages are available). We also limit the scope - # for a particular osRel. - #""" + """ Clients v1- Get errata for a package given "n-v-r" format + IN: pkg: "n-v-r" (old client call) + or [n,v,r] + osRel: OS release + RET: a hash by errata that applies to this package + (ie, newer packages are available). We also limit the scope + for a particular osRel. + """ if type(pkg) == type(''): # Old client support. pkg = parseRPMName(pkg) log_debug(1, pkg, osRel) @@ -104,14 +102,13 @@ class Errata(rhnHandler): ret.append(row) return ret
- # Clients v2+ - # Get errata for a package given [n,v,r,e,a,...] format def getPackageErratum(self, system_id, pkg): - #""" - #Sing-along: You say erratum(sing), I say errata(pl)! :) - #IN: pkg: [n,v,r,e,s,a,ch,...] - #RET: a hash by errata that applies to this package - #""" + """ Clients v2+ - Get errata for a package given [n,v,r,e,a,...] format + + Sing-along: You say erratum(sing), I say errata(pl)! :) + IN: pkg: [n,v,r,e,s,a,ch,...] + RET: a hash by errata that applies to this package + """ log_debug(5, system_id, pkg) if type(pkg) != type([]) or len(pkg) < 7: log_error("Got invalid package specification: %s" % str(pkg))
commit ebb44590aa1a3371004cc5c0847b2f9fe3109fc8 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jun 24 10:59:33 2009 +0200
change comments to docstrings
diff --git a/backend/server/handlers/app/packages.py b/backend/server/handlers/app/packages.py index f982b5b..7747978 100644 --- a/backend/server/handlers/app/packages.py +++ b/backend/server/handlers/app/packages.py @@ -75,13 +75,12 @@ class Packages(RPC_Base): self.functions.append('getSourcePackageMD5sum') self.functions.append('getSourcePackageMD5sumBySession')
- ###This is so the client can tell if the satellite supports session tokens or not def no_op(self): + """ This is so the client can tell if the satellite supports session tokens or not. """ return 1
- ###uploadPackageInfo### - # upload a collection of binary packages def uploadPackageInfo(self, username, password, info): + """ Upload a collection of binary packages. """ log_debug(5, username, info) authobj = auth(username, password) return self._uploadPackageInfo(authobj, info) @@ -104,9 +103,8 @@ class Packages(RPC_Base): return uploadPackages(info, force=force, caller="server.app.uploadPackageInfo")
- ###uploadSourcePackageInfo### - # same stuff, but for source packages def uploadSourcePackageInfo(self, username, password, info): + """ Upload a collection of source packages. """ log_debug(5, username, info) authobj = auth(username, password) return self._uploadSourcePackageInfo(authobj, info) @@ -143,8 +141,7 @@ class Packages(RPC_Base):
def listChannel(self, channelList, username, password): - """list packages of a specified channel - """ + """ List packages of a specified channel. """ log_debug(5, channelList, username) authobj = auth(username, password) return self._listChannel(authobj, channelList) @@ -158,11 +155,11 @@ class Packages(RPC_Base): authobj.authzChannels(channelList) return listChannels(channelList)
- - #12/22/05 wregglej 173287 This is a new function that takes in the username - #and password and returns a session string if they are correct. It raises a - #rhnFault if the user/pass combo is not acceptable. def login(self, username, password): + """ This function that takes in the username + and password and returns a session string if they are correct. It raises a + rhnFault if the user/pass combo is not acceptable. + """ log_debug(5, username) user = rhnUser.search(username) if not user or not user.check_password(password): @@ -170,10 +167,8 @@ class Packages(RPC_Base): session = user.create_session() return session.get_session()
- - #12/22/05 wregglej 173287 Checks a session string to make sure it is authentic - #expired. def check_session(self, session): + """ Checks a session string to make sure it is authentic expired. """ try: user = rhnUser.session_reload(session) except (rhnSession.InvalidSessionError, rhnSession.ExpiredSessionError): @@ -188,20 +183,20 @@ class Packages(RPC_Base): return 0 return 1
- #12/22/05 wregglej 173287 rhnpush's --extended-test will call this function. def test_new_login(self, username, password, session=None): + """ rhnpush's --extended-test will call this function. """ log_debug(5, "testing new login") return self.login(username, password)
- #12/22/05 wregglej 173287 rhnpush's --extended-test will call this function. def test_check_session(self, session): + """ rhnpush's --extended-test will call this function. """ log_debug(5, "testing check session") return self.check_session(session)
###listMissingSourcePackages### def listMissingSourcePackages(self, channelList, username, password): - #"list source packages for a list of channels" + """ List source packages for a list of channels. """ log_debug(5, channelList, username) authobj = auth(username, password) return self._listMissingSourcePackages(authobj, channelList) @@ -254,8 +249,7 @@ class Packages(RPC_Base):
def uploadPackage(self, username, password, info): - """Uploads an RPM package - """ + """ Uploads an RPM package. """ log_debug(3)
channels = info.get('channels', []) @@ -300,8 +294,7 @@ class Packages(RPC_Base):
def channelPackageSubscription(self, username, password, info): - """Uploads an RPM package - """ + """ Uploads an RPM package. """ log_debug(3) authobj = auth(username, password) return self._channelPackageSubscription(authobj, info) @@ -541,8 +534,7 @@ class Packages(RPC_Base): return row_list
def getSourcePackageMD5sum(self, username, password, info): - #"""Uploads an RPM package - #""" + """ Uploads an RPM package """ log_debug(3)
pkg_infos = info.get('packages') @@ -584,9 +576,11 @@ class Packages(RPC_Base):
return self._getSourcePackageMD5sum(org_id, pkg_infos, info)
- #pkilambi:bug#177762 gives md5sum info of available source packages. - #also does an existance check on the filesystem. def _getSourcePackageMD5sum(self, org_id, pkg_infos, info): + """ Gives md5sum info of available source packages. + Also does an existance check on the filesystem. + """ + log_debug(3)
statement = """ @@ -637,8 +631,7 @@ class Packages(RPC_Base):
# Helper functions def _getSourcePackageInfo(self, source_rpm_id): - #"""get dictionary containing source package information. - #""" + """ Get dictionary containing source package information. """ log_debug(4, source_rpm_id) statement = """ select @@ -667,13 +660,13 @@ class Packages(RPC_Base): return row
def auth(login, password): - # Authorize this user + """ Authorize this user. """ authobj = UserAuth() authobj.auth(login, password) return authobj
-#wregglej 12/21/05 Authenticate based on a session def auth_session(session_string): + """ Authenticate based on a session. """ authobj = UserAuth() authobj.auth_session(session_string) return authobj
commit c8d7b39a46888db6fe1c142f3d22df99a599e79d Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jun 24 10:40:11 2009 +0200
change comments to docstrings
diff --git a/backend/server/action/solarispkgs.py b/backend/server/action/solarispkgs.py index 3369018..9d3b239 100644 --- a/backend/server/action/solarispkgs.py +++ b/backend/server/action/solarispkgs.py @@ -123,11 +123,11 @@ patchClusterInstall = install patchClusterRemove = remove
def refresh_list(serverId, actionId): - #"""Call the equivalent of up2date -p. - # - # I.e. update the list of a client's installed packages known by - # Red Hat's DB. - #""" + """ Call the equivalent of up2date -p. + + I.e. update the list of a client's installed packages known by + Red Hat's DB. + """ log_debug(3) return None
commit 9f9e787677b319062edeba0ac6239601beee2fa6 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jun 24 10:40:07 2009 +0200
change comments to docstrings
diff --git a/backend/server/action/packages.py b/backend/server/action/packages.py index 9d62fb4..523c8b0 100644 --- a/backend/server/action/packages.py +++ b/backend/server/action/packages.py @@ -116,11 +116,11 @@ def update(serverId, actionId):
def refresh_list(serverId, actionId): - #"""Call the equivalent of up2date -p. - # - # I.e. update the list of a client's installed packages known by - # Red Hat's DB. - #""" + """ Call the equivalent of up2date -p. + + I.e. update the list of a client's installed packages known by + Red Hat's DB. + """ log_debug(3) return None
commit fca52b7373cb4269cb21388e926775539c607982 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jun 24 10:38:34 2009 +0200
change comments to docstrings
diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index 42bda4c..e1e00c6 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -303,7 +303,7 @@ class XML_Dumper: """)
def _cache_channel_packages_short(self, channel_id, key, last_modified): - # Caches the short package entries for channel_id + """ Caches the short package entries for channel_id """ # Create a temporary file temp_stream = tempfile.TemporaryFile() # Always compress the result @@ -333,9 +333,10 @@ class XML_Dumper: return self._normalize_compressed_stream(temp_stream)
def _normalize_compressed_stream(self, stream): - # Given a compressed stream, will either return the stream, or will - # decompress it and return it, depending on the compression level - # self.compress_level + """ Given a compressed stream, will either return the stream, or will + decompress it and return it, depending on the compression level + self.compress_level + """ stream.seek(0, 0) if self.compress_level: # Output should be compressed; nothing else to to @@ -526,20 +527,20 @@ class XML_Dumper: return result
class SatelliteDumper(exportLib.SatelliteDumper): - # Overriding with our own version def set_attributes(self): + """ Overriding with our own version """ attributes = exportLib.SatelliteDumper.set_attributes(self) attributes['version'] = CFG.XML_DUMP_VERSION attributes['generation'] = CFG.SAT_CERT_GENERATION return attributes
- -# A query iterator successively applies the list of params as execute() to the -# statement that was passed in, and presents the union of the result sets as a -# single result set. -# Params is a list of dictionaries that would fill the named bound variables -# from the statement class QueryIterator: + """ A query iterator successively applies the list of params as execute() to the + statement that was passed in, and presents the union of the result sets as a + single result set. + Params is a list of dictionaries that would fill the named bound variables + from the statement. + """ def __init__(self, statement, params): self._statement = statement self._params = params @@ -581,12 +582,13 @@ class QueryIterator: return None apply(self._statement.execute, (), self._params[self._params_pos])
-# This class will attempt to retrieve information, either from the database or -# from a local cache -# -# Note that we expect at most one result set per database query - this can be -# easily fixed if we need more class CachedQueryIterator: + """ This class will attempt to retrieve information, either from the database or + from a local cache. + + Note that we expect at most one result set per database query - this can be + easily fixed if we need more. + """ def __init__(self, statement, params, cache_get): self._statement = statement # XXX params has to be a list of hashes, containing at least a @@ -632,8 +634,9 @@ class CachedQueryIterator: apply(self._statement.execute, (), params)
def close(self): - # Make sure we remove references to these objects, or circular - # references can occur + """ Make sure we remove references to these objects, or circular + references can occur. + """ log_debug(3, "Closing the iterator") self._statement = None self._cache_get = None @@ -649,7 +652,7 @@ class CachedDumper(exportLib.BaseDumper): log_debug(1, "Use database cache", self.use_database_cache)
def _get_last_modified(self, params): - # To be overwritten + """ To be overwritten. """ return params['last_modified']
def _get_key(self, params): @@ -676,7 +679,7 @@ class CachedDumper(exportLib.BaseDumper): compressed=1)
def _dump_subelement(self, data): - # To be overridden in subclasses + """ To be overridden in subclasses. """ pass
def dump_subelement(self, data): @@ -1097,13 +1100,14 @@ class KickstartableTreesDumper(CachedDumper, exportLib.KickstartableTreesDumper) log_debug(6, data) return exportLib.KickstartableTreesDumper.dump_subelement(self, data)
-# This looks complicated; it returns the (integer part of) -# obj_id, modulo factor -# The string is left padded with as many 0 chars as necessary to -# match factor -# XXX This is copied from satellite_tools.diskImportLib.hashPackageID - -# should figure out a way to share it -- misa def hash_object_id(obj_id, factor): + """ This looks complicated; it returns the (integer part of) + obj_id, modulo factor + The string is left padded with as many 0 chars as necessary to + match factor + XXX This is copied from satellite_tools.diskImportLib.hashPackageID - + should figure out a way to share it -- misa + """ # Make sure obj_id is a string obj_id = str(obj_id) format = int(math.ceil(math.log10(factor)))
commit f268127d275bfe6669f41b64678be3f1b404f315 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jun 24 10:32:23 2009 +0200
change comments to docstrings
diff --git a/backend/common/rhnApache.py b/backend/common/rhnApache.py index 77fe50a..c4cacb7 100644 --- a/backend/common/rhnApache.py +++ b/backend/common/rhnApache.py @@ -33,18 +33,15 @@ from rhnLog import log_debug from rhnLog import log_error from rhnTranslate import cat
- -# Shared rhnApache class: rhnApache classes in proxy and server inherit this -# class. - - class rhnApache: + """ Shared rhnApache class: rhnApache classes in proxy and server inherit + this class. + + Shared apache handler code: headerParserHandler, + handler (defined in class that inherits this), + cleanupHandler. + """ _lang_catalog = "common" - #""" - #Shared apache handler code: headerParserHandler, - # handler (defined in class that inherits this), - # cleanupHandler. - #"""
def __init__(self): self.lang = "C" @@ -127,7 +124,7 @@ class rhnApache: return apache.OK
def _set_proxy_info(self, req): - # RHN Proxy stuff: + """ RHN Proxy stuff. """ proxyVersion = 'X-RHN-Proxy-Version' if req.headers_in.has_key(proxyVersion): self.proxyVersion = req.headers_in[proxyVersion] @@ -141,7 +138,7 @@ class rhnApache: return apache.OK
def _set_lang(self, req): - # determine what language the client prefers + """ determine what language the client prefers """ if req.headers_in.has_key("Accept-Language"): # RFC 2616 #3.10: case insensitive lang = string.lower(req.headers_in["Accept-Language"]) @@ -241,10 +238,9 @@ class rhnApache: return string.join(cat.getlangs(), "; ")
def _setSessionToken(self, headers): - #""" - #Pushes token into rhnFlags. If doesn't exist, returns None. - #Pull session token out of the headers and into rhnFlags. - #""" + """ Pushes token into rhnFlags. If doesn't exist, returns None. + Pull session token out of the headers and into rhnFlags. + """ log_debug(3) token = UserDictCase() if headers.has_key('X-RHN-Server-Id'):
commit 27f205f32c13a1d63e033b23f8bb6701e0609f96 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jun 24 10:23:09 2009 +0200
499723 - accept follow-redirects with value greater then 2
diff --git a/backend/common/rhnRepository.py b/backend/common/rhnRepository.py index 17efe5a..fabb781 100644 --- a/backend/common/rhnRepository.py +++ b/backend/common/rhnRepository.py @@ -101,7 +101,8 @@ class Repository(RPC_Base): # Must be a client. We'll determine the redirect capability via # the x-rhn-transport-capability header instead. transport_cap = rhnFlags.get('x-rhn-transport-capability') - redirectsSupported = transport_cap == 'follow-redirects=2' + transport_cap_list = transport_cap.split('=') + redirectsSupported = transport_cap_list[0] == 'follow-redirects' and transport_cap_list[1] >= 2
if redirectsSupported: log_debug(3, "Client supports redirects.")
commit bb617e87564acc038f40140e81965002d6943da3 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Jun 24 08:34:35 2009 +0200
change comments to docstrings
diff --git a/backend/common/rhnRepository.py b/backend/common/rhnRepository.py index e9d1c2d..17efe5a 100644 --- a/backend/common/rhnRepository.py +++ b/backend/common/rhnRepository.py @@ -30,9 +30,10 @@ from rhnLib import rfc822time from rhnException import rhnException, rhnFault from RPC_Base import RPC_Base
-# Shared repository class, inherited by both the proxy and server specific -# Repository classes. class Repository(RPC_Base): + """ Shared repository class, inherited by both the proxy and server specific + Repository classes. + """ def __init__(self, channelName = None): log_debug(2, channelName) RPC_Base.__init__(self) @@ -52,28 +53,28 @@ class Repository(RPC_Base): self.channelName = None self.functions = None
- # Returns the path to a package. def getPackagePath(self, pkgFilename, redirect=0): - #"""OVERLOAD this in server and proxy rhnRepository. - # I.e.: they construct the path differently. - #""" + """Returns the path to a package. + OVERLOAD this in server and proxy rhnRepository. + I.e.: they construct the path differently. + """ raise rhnException("This function should be overloaded.")
def getPackagePathNVRA(self, nvra): - #"""OVERLOAD this in server and proxy rhnRepository. - # I.e.: they construct the path differently. - #""" + """OVERLOAD this in server and proxy rhnRepository. + I.e.: they construct the path differently. + """ raise rhnException("This function should be overloaded.")
- # Returns the path to a package. def getSourcePackagePath(self, pkgFilename): - #"""OVERLOAD this in server and proxy rhnRepository. - # I.e.: they construct the path differently. - #""" + """Returns the path to a package. + OVERLOAD this in server and proxy rhnRepository. + I.e.: they construct the path differently. + """ raise rhnException("This function should be overloaded.")
- # Get rpm package. def getPackage(self, pkgFilename, *args): + """ Get rpm package. """ log_debug(3, pkgFilename) if args: pkg_spec = [pkgFilename] + list(args) @@ -103,16 +104,16 @@ class Repository(RPC_Base): redirectsSupported = transport_cap == 'follow-redirects=2'
if redirectsSupported: - log_debug(3, "Client supports redirects.") - filePath = self.getPackagePath(pkg_spec, 1) - else: + log_debug(3, "Client supports redirects.") + filePath = self.getPackagePath(pkg_spec, 1) + else: #older clients just return the hosted url and download the package - filePath = self.getPackagePath(pkg_spec) + filePath = self.getPackagePath(pkg_spec)
- return self._getFile(filePath) + return self._getFile(filePath)
- # Get srpm packrge. def getPackageSource(self, pkgFilename): + """ Get srpm packrge. """ log_debug(3, pkgFilename) # Sanity check: l = string.split(pkgFilename, '.') @@ -123,10 +124,11 @@ class Repository(RPC_Base): filePath = self.getSourcePackagePath(pkgFilename) return self._getFile(filePath)
- # Get rpm header. - # XXX: stock 8.0 clients could not compress headers, we need to either - # change the function name, or version the protocol def getPackageHeader(self, pkgFilename): + """ Get rpm header. + XXX: stock 8.0 clients could not compress headers, we need to either + change the function name, or version the protocol + """ log_debug(3, pkgFilename) pkg = string.split(pkgFilename, '.') # Basic sanity checks: @@ -148,12 +150,11 @@ class Repository(RPC_Base):
# --- PRIVATE METHODS ---
- # Returns xmlrpclib file object to any file given a path to it. def _getFile(self, filePath): - #''' - #IN: filePath: path to any file. - #OUT: XMLed rpm or source rpm, or an xmlrpc file object. - #''' + """ Returns xmlrpclib file object to any file given a path to it. + IN: filePath: path to any file. + OUT: XMLed rpm or source rpm, or an xmlrpc file object. + """ log_debug(3, filePath) features = self._fileFeatures(filePath) filePath = features['path'] @@ -162,9 +163,10 @@ class Repository(RPC_Base): self._set_last_modified(lastModified) return rpclib.File(open(filePath, "rb"), length, name=filePath)
- # Utility function to extract a header from an rpm. - # If stat_info was already passed, don't re-stat the file def _getHeaderFromFile(self, filePath, stat_info=None): + """ Utility function to extract a header from an rpm. + If stat_info was already passed, don't re-stat the file + """ log_debug(3, filePath) if stat_info: s = stat_info @@ -218,8 +220,8 @@ class Repository(RPC_Base): transport[str(k)] = str(v) return transport
- # From a filepath, construct a dictionary of file features. def _fileFeatures(self, filePath): + """ From a filepath, construct a dictionary of file features. """ log_debug(3, filePath) if not filePath: raise rhnFault(17, "While looking for file: `%s'"
commit bdaa80f9c64c969b328f039fab22b905728b568e Author: Miroslav Suchý msuchy@redhat.com Date: Tue Jun 23 15:43:29 2009 +0200
change comments to docstrings
diff --git a/backend/common/rhnTB.py b/backend/common/rhnTB.py index 5608498..794607c 100644 --- a/backend/common/rhnTB.py +++ b/backend/common/rhnTB.py @@ -35,8 +35,8 @@ hostname = socket.gethostname() # avoid a huge flood of mail requests. QUIET_MAIL = None
-# Dump the environment. def print_env(fd = sys.stderr): + """ Dump the environment. """ dct = os.environ fd.write("\nEnvironment for PID=%d on exception:\n" % os.getpid()) el = dct.keys() @@ -45,9 +45,10 @@ def print_env(fd = sys.stderr): fd.write("%s = %s\n" % (k, dct[k]))
-# Dump a listing of all local variables and their value for better debugging -# chance. def print_locals(fd = sys.stderr, tb = None): + """ Dump a listing of all local variables and their value for better debugging + chance. + """ if tb is None: tb = sys.exc_info()[2] stack = [] @@ -82,9 +83,9 @@ def print_locals(fd = sys.stderr, tb = None):
def print_req(req, fd = sys.stderr): - #""" get some debugging information about the current exception for sending - # out when we raise an exception - #""" + """ get some debugging information about the current exception for sending + out when we raise an exception + """
fd.write("Request object information:\n") fd.write("URI: %s\n" % req.unparsed_uri) @@ -100,9 +101,9 @@ def print_req(req, fd = sys.stderr):
def Traceback(method = None, req = None, mail = 1, ostream = sys.stderr, extra = None, severity="notification", with_locals=0): - #""" Reports an traceback error and optionally sends mail about it. - # NOTE: extra = extra text information. - #""" + """ Reports an traceback error and optionally sends mail about it. + NOTE: extra = extra text information. + """
global QUIET_MAIL
@@ -176,15 +177,16 @@ def Traceback(method = None, req = None, mail = 1, ostream = sys.stderr,
def fetchTraceback(method=None, req=None, extra=None, with_locals=0): - #""" a cheat for snagging just the string value of a Traceback """ + """ a cheat for snagging just the string value of a Traceback """ exc = StringIO() Traceback(method=method, req=req, mail=0, ostream=exc, extra=extra, severity=None, with_locals=with_locals) return exc.getvalue()
-#The SecurityList is a list of strings that are censored out of a debug email. -#Right now it's only used for censoring traceback emails. class SecurityList: + """ The SecurityList is a list of strings that are censored out of a debug email. + Right now it's only used for censoring traceback emails. + """ _flag_string = "security-list" def __init__(self): # We store the security list in the global flags. This way, we don't @@ -201,25 +203,25 @@ class SecurityList: def check(self, obj): return obj in self.sec
-#Returns the list of strings to be censored. def get_seclist(): + """ Returns the list of strings to be censored. """ return SecurityList().sec
-#Remove all instances of the strings in seclist.sec from strval def censor_string(strval): + """ Remove all instances of the strings in seclist.sec from strval """ censorlist = get_seclist() for c in censorlist: #Censor it with a fixed length string. This way the length of the hidden string isn't revealed. strval = string.replace(strval, c, "<CENSORED!>") return strval
-#Adds a string to seclist.sec, but only if it's not already there. def add_to_seclist(obj): + """ Adds a string to seclist.sec, but only if it's not already there. """ seclist = SecurityList() if not seclist.check(obj): seclist.add(obj)
-#Checks whether a string is in seclist.sec or not. Returns True or False. def check_with_seclist(obj): + """ Checks whether a string is in seclist.sec or not. Returns True or False. """ seclist = SecurityList() return seclist.check(obj)
commit 0a04fd42044b2a05f777f9a6fd6136a6439880c7 Author: Partha Aji paji@redhat.com Date: Wed Jun 24 21:29:15 2009 -0400
Fix to make sure kernel param entries don;t get duplicated
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 07ad6c1..434b8f2 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java @@ -975,11 +975,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation { // Get rid of the dhcp: String params = " ksdevice=" + staticDevice.substring( staticDevice.indexOf("dhcp:") + "dhcp:".length()); - if (!kOptions.contains("ksdevice=eth0")) { - retval.append(" ksdevice=eth0 "); - } - - if (!kOptions.contains(params)) { + if (!kOptions.contains("ksdevice")) { retval.append(params); } staticDevice = ""; @@ -991,7 +987,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
} else { - if (!kOptions.contains("ksdevice=eth0")) { + if (!kOptions.contains("ksdevice")) { retval.append("ksdevice=eth0"); } }
commit 6dc44f2b58f00afcf70e1675b52f5d1e9d712174 Author: John Matthews jmatthew@redhat.com Date: Wed Jun 24 17:56:02 2009 -0400
Automatic commit of package [spacewalk-config] release [0.6.7-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config index 9414473..2f739b8 100644 --- a/rel-eng/packages/spacewalk-config +++ b/rel-eng/packages/spacewalk-config @@ -1 +1 @@ -0.6.5-1 spacewalk/config/ +0.6.7-1 spacewalk/config/ diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec index 8ade8ea..0e42c3b 100644 --- a/spacewalk/config/spacewalk-config.spec +++ b/spacewalk/config/spacewalk-config.spec @@ -2,7 +2,7 @@
Name: spacewalk-config Summary: Spacewalk Configuration -Version: 0.6.6 +Version: 0.6.7 Release: 1%{?dist} URL: http://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -114,7 +114,7 @@ fi
%changelog -* Wed Jun 24 2009 John Matthews jmatthew@redhat.com 0.6.6-1 +* Wed Jun 24 2009 John Matthews jmatthew@redhat.com 0.6.7-1 - 507679 - Added custom server.xml to force UTF8 encoding of GET parameters in tomcat
* Mon May 18 2009 Mike McCune mmccune@gmail.com 0.6.5-1
commit 6c1cd48560b5ce0232f444659523053dbdf5d09a Author: Partha Aji paji@redhat.com Date: Wed Jun 24 16:42:53 2009 -0400
492206 - Fixed kickstart template error
Basically the url in the case of a cobbler error was pointing to the wrong page..
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java index 042b697..255769c 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartManager.java @@ -74,7 +74,7 @@ public class KickstartManager extends BaseManager { String text = renderKickstart(ksdata); if (text.contains("Traceback (most recent call last):")) { ValidatorException.raiseException("kickstart.jsp.error.template_generation", - KickstartUrlHelper.getCobblerProfileUrl(ksdata)); + KickstartUrlHelper.getFileDowloadPageUrl(ksdata)); } } catch (DownloadException de) {
commit 83d060e4b3a9ee48a9d113210075ec2fd50000f9 Author: Shannon Hughes shughes@redhat.com Date: Wed Jun 24 16:16:57 2009 -0400
507533 - added catch around unhandled exception for pkg in mutiple channels
diff --git a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java index ded9c09..8467e61 100644 --- a/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java +++ b/java/code/src/com/redhat/rhn/manager/token/ActivationKeyManager.java @@ -39,6 +39,7 @@ import com.redhat.rhn.domain.token.ActivationKey; import com.redhat.rhn.domain.token.ActivationKeyFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.manager.channel.ChannelManager; +import com.redhat.rhn.manager.channel.MultipleChannelsWithPackageException; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.kickstart.cobbler.CobblerXMLRPCHelper; import com.redhat.rhn.manager.rhnpackage.PackageManager; @@ -497,8 +498,16 @@ public class ActivationKeyManager { //we know its the channel we want if it has the rhncfg package in it. Long bcid = key.getBaseChannel().getId(); log.debug("found basechannel: " + bcid); - Long cid = ChannelManager.findChildChannelWithPackage(key.getOrg(), bcid, + Long cid; + try { + cid = ChannelManager.findChildChannelWithPackage(key.getOrg(), bcid, packageName); + } + catch (MultipleChannelsWithPackageException mcwpe) { + log.debug("can not subscribe due to multiple channels have package " + + packageName); + return false; + } if (cid == null) { // Didnt find it .. log.debug("didnt find a child channel with the package."); return false;
commit 94b95df77f53a9fe2e1d48113ba75d2ad8a9db20 Author: Partha Aji paji@redhat.com Date: Wed Jun 24 14:04:37 2009 -0400
507862 - Fixed an ise that occured when config deploy was selected on a profile
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 27ddc0b..07ad6c1 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java @@ -904,9 +904,9 @@ public class KickstartScheduleCommand extends BaseSystemOperation { // Now create ActivationKey ActivationKey key = ActivationKeyManager.getInstance(). createNewReActivationKey(creator, server, note, session); + key.addEntitlement(ServerConstants.getServerGroupTypeProvisioningEntitled()); key.setDeployConfigs(deployConfigs); key.setUsageLimit(usageLimit); - key.addEntitlement(ServerConstants.getServerGroupTypeProvisioningEntitled()); if (KickstartVirtualizationType.paraHost(). equals(ksdata.getKickstartDefaults().getVirtualizationType())) { //we'll have to setup the key for virt
commit f86dde69077d807952fb2d69f543277753f0f301 Author: Justin Sherrill jsherril@redhat.com Date: Wed Jun 24 12:56:14 2009 -0400
507863 - fixing issue where enabling remote commands would not be saved
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 7749f7a..422b999 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 @@ -275,7 +275,7 @@ public class SystemDetailsEditAction extends RhnAction { SystemDetailsCommand command) { command.enableConfigManagement(BooleanUtils.toBoolean(form .getString("configManagement"))); - command.enableConfigManagement(BooleanUtils.toBoolean(form + command.enableRemoteCommands(BooleanUtils.toBoolean(form .getString("remoteCommands")));
}
commit d0796a84441c62c199107552b7c8e9a2ce456ce8 Author: Pradeep Kilambi pkilambi@redhat.com Date: Wed Jun 24 12:41:25 2009 -0400
507867 - Schedule repo gen once the channel package associations is complete
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py index 90ba02e..e1f84c6 100644 --- a/backend/server/importlib/packageImport.py +++ b/backend/server/importlib/packageImport.py @@ -121,6 +121,9 @@ class ChannelPackageSubscription(GenericPackageImport): self.compute_affected_channels(affected_channels) self.backend.update_newest_package_cache(caller=self.caller, affected_channels=self.affected_channel_packages) + # Now that channel is updated, schedule the repo generation + taskomatic.add_to_repodata_queue_for_channel_package_subscription( + self.affected_channels, self.batch, self.caller) self.backend.commit()
def compute_affected_channels(self, affected_channels):
commit 72a7c0fd5148ccc994065f9b9ad9d7408bb5223b Author: Partha Aji paji@redhat.com Date: Wed Jun 24 12:36:31 2009 -0400
507888 - Set the default virt mem value to 512 instead of 256
Apparently thats the minimum requirement.
diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/code/src/com/redhat/rhn/common/conf/Config.java index 13fe9c3..ad40462 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -807,7 +807,7 @@ public class Config { * @return the memory size */ public int getDefaultVirtMemorySize() { - return getInt(VIRT_MEM, 256); + return getInt(VIRT_MEM, 512); }
/**
commit 4d4c5de265176bc517e9d03d4a8df4cd56076919 Author: John Matthews jmatthew@redhat.com Date: Wed Jun 24 12:12:16 2009 -0400
specfile update
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec index c761a1b..8ade8ea 100644 --- a/spacewalk/config/spacewalk-config.spec +++ b/spacewalk/config/spacewalk-config.spec @@ -54,7 +54,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{prepdir}%{_sysconfdir}/tomcat5 -%config(noreplace) %{_sysconfdir}/tomcat5/server.xml %attr(0755,root,root) %{_sysconfdir}/rhn/satellite-httpd/conf/satidmap.pl %attr(0755,root,root) %{_sysconfdir}/rhn/satellite-httpd/conf/startup.pl %config(noreplace) %{_sysconfdir}/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf
commit e9fefd8f5097f6f849b39753eba558983f4f2e81 Author: John Matthews jmatthew@redhat.com Date: Wed Jun 24 12:01:12 2009 -0400
507679 - add server.xml to spacewalk-config package
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec index 50c81ec..c761a1b 100644 --- a/spacewalk/config/spacewalk-config.spec +++ b/spacewalk/config/spacewalk-config.spec @@ -2,7 +2,7 @@
Name: spacewalk-config Summary: Spacewalk Configuration -Version: 0.6.5 +Version: 0.6.6 Release: 1%{?dist} URL: http://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -54,6 +54,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{prepdir}%{_sysconfdir}/tomcat5 +%config(noreplace) %{_sysconfdir}/tomcat5/server.xml %attr(0755,root,root) %{_sysconfdir}/rhn/satellite-httpd/conf/satidmap.pl %attr(0755,root,root) %{_sysconfdir}/rhn/satellite-httpd/conf/startup.pl %config(noreplace) %{_sysconfdir}/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf @@ -114,6 +115,9 @@ fi
%changelog +* Wed Jun 24 2009 John Matthews jmatthew@redhat.com 0.6.6-1 +- 507679 - Added custom server.xml to force UTF8 encoding of GET parameters in tomcat + * Mon May 18 2009 Mike McCune mmccune@gmail.com 0.6.5-1 - 496104 - need to make the regexes for the rewrites a bit more flexible (mmccune@gmail.com)
commit 24b60a9efdc5b9fcd5aab80a7bd6535be434c99e Author: John Matthews jmatthew@redhat.com Date: Wed Jun 24 11:42:14 2009 -0400
507679 - Set URIEncoding to UTF-8 for tomcats server.xml config file Intent of this change is to force encoding of GET parameters to be in UTF-8 This is the default server.xml from tomcat RPM with a change of URIEncoding="UTF-8" added to the Connector elements. For background info reference: http://wiki.apache.org/tomcat/FAQ/CharacterEncoding#Q2
diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/tomcat5/server.xml b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/tomcat5/server.xml new file mode 100644 index 0000000..e6ccb70 --- /dev/null +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/tomcat5/server.xml @@ -0,0 +1,394 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!-- Example Server Configuration File --> +<!-- Note that component elements are nested corresponding to their + parent-child relationships with each other --> + +<!-- A "Server" is a singleton element that represents the entire JVM, + which may contain one or more "Service" instances. The Server + listens for a shutdown command on the indicated port. + + Note: A "Server" is not itself a "Container", so you may not + define subcomponents such as "Valves" or "Loggers" at this level. + --> + +<Server port="8005" shutdown="SHUTDOWN"> + + <!-- Comment these entries out to disable JMX MBeans support used for the + administration web application --> + <Listener className="org.apache.catalina.core.AprLifecycleListener" /> + <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" /> + <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> + <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/> + + <!-- Global JNDI resources --> + <GlobalNamingResources> + + <!-- Test entry for demonstration purposes --> + <Environment name="simpleValue" type="java.lang.Integer" value="30"/> + + <!-- Editable user database that can also be used by + UserDatabaseRealm to authenticate users --> + <Resource name="UserDatabase" auth="Container" + type="org.apache.catalina.UserDatabase" + description="User database that can be updated and saved" + factory="org.apache.catalina.users.MemoryUserDatabaseFactory" + pathname="conf/tomcat-users.xml" /> + + </GlobalNamingResources> + + <!-- A "Service" is a collection of one or more "Connectors" that share + a single "Container" (and therefore the web applications visible + within that Container). Normally, that Container is an "Engine", + but this is not required. + + Note: A "Service" is not itself a "Container", so you may not + define subcomponents such as "Valves" or "Loggers" at this level. + --> + + <!-- Define the Tomcat Stand-Alone Service --> + <Service name="Catalina"> + + <!-- A "Connector" represents an endpoint by which requests are received + and responses are returned. Each Connector passes requests on to the + associated "Container" (normally an Engine) for processing. + + By default, a non-SSL HTTP/1.1 Connector is established on port 8080. + You can also enable an SSL HTTP/1.1 Connector on port 8443 by + following the instructions below and uncommenting the second Connector + entry. SSL support requires the following steps (see the SSL Config + HOWTO in the Tomcat 5 documentation bundle for more detailed + instructions): + * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or + later, and put the JAR files into "$JAVA_HOME/jre/lib/ext". + * Execute: + %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows) + $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA (Unix) + with a password value of "changeit" for both the certificate and + the keystore itself. + + By default, DNS lookups are enabled when a web application calls + request.getRemoteHost(). This can have an adverse impact on + performance, so you can disable it by setting the + "enableLookups" attribute to "false". When DNS lookups are disabled, + request.getRemoteHost() will return the String version of the + IP address of the remote client. + --> + + <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 --> + <Connector port="8080" maxHttpHeaderSize="8192" + maxThreads="150" minSpareThreads="25" maxSpareThreads="75" + enableLookups="false" redirectPort="8443" acceptCount="100" + connectionTimeout="20000" disableUploadTimeout="true" + URIEncoding="UTF-8" /> + + <!-- Note : To disable connection timeouts, set connectionTimeout value + to 0 --> + + <!-- Note : To use gzip compression you could set the following properties : + + compression="on" + compressionMinSize="2048" + noCompressionUserAgents="gozilla, traviata" + compressableMimeType="text/html,text/xml" + --> + + <!-- Define a SSL HTTP/1.1 Connector on port 8443 --> + <!-- + <Connector port="8443" maxHttpHeaderSize="8192" + maxThreads="150" minSpareThreads="25" maxSpareThreads="75" + enableLookups="false" disableUploadTimeout="true" + acceptCount="100" scheme="https" secure="true" + clientAuth="false" sslProtocol="TLS" /> + --> + + <!-- Define an AJP 1.3 Connector on port 8009 --> + <Connector port="8009" + enableLookups="false" redirectPort="8443" protocol="AJP/1.3" + URIEncoding="UTF-8"/> + + <!-- Define a Proxied HTTP/1.1 Connector on port 8082 --> + <!-- See proxy documentation for more information about using this. --> + <!-- + <Connector port="8082" + maxThreads="150" minSpareThreads="25" maxSpareThreads="75" + enableLookups="false" acceptCount="100" connectionTimeout="20000" + proxyPort="80" disableUploadTimeout="true" /> + --> + + <!-- An Engine represents the entry point (within Catalina) that processes + every request. The Engine implementation for Tomcat stand alone + analyzes the HTTP headers included with the request, and passes them + on to the appropriate Host (virtual host). --> + + <!-- You should set jvmRoute to support load-balancing via AJP ie : + <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1"> + --> + + <!-- Define the top level container in our container hierarchy --> + <Engine name="Catalina" defaultHost="localhost"> + + <!-- The request dumper valve dumps useful debugging information about + the request headers and cookies that were received, and the response + headers and cookies that were sent, for all requests received by + this instance of Tomcat. If you care only about requests to a + particular virtual host, or a particular application, nest this + element inside the corresponding <Host> or <Context> entry instead. + + For a similar mechanism that is portable to all Servlet 2.4 + containers, check out the "RequestDumperFilter" Filter in the + example application (the source for this filter may be found in + "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters"). + + Note that this Valve uses the platform's default character encoding. + This may cause problems for developers in another encoding, e.g. + UTF-8. Use the RequestDumperFilter instead. + + Also note that enabling this Valve will write a ton of stuff to your + logs. They are likely to grow quite large. This extensive log writing + will definitely slow down your server. + + Request dumping is disabled by default. Uncomment the following + element to enable it. --> + <!-- + <Valve className="org.apache.catalina.valves.RequestDumperValve"/> + --> + + <!-- Because this Realm is here, an instance will be shared globally --> + + <!-- This Realm uses the UserDatabase configured in the global JNDI + resources under the key "UserDatabase". Any edits + that are performed against this UserDatabase are immediately + available for use by the Realm. --> + <Realm className="org.apache.catalina.realm.UserDatabaseRealm" + resourceName="UserDatabase"/> + + <!-- Comment out the old realm but leave here for now in case we + need to go back quickly --> + <!-- + <Realm className="org.apache.catalina.realm.MemoryRealm" /> + --> + + <!-- Replace the above Realm with one of the following to get a Realm + stored in a database and accessed via JDBC --> + + <!-- + <Realm className="org.apache.catalina.realm.JDBCRealm" + driverName="org.gjt.mm.mysql.Driver" + connectionURL="jdbc:mysql://localhost/authority" + connectionName="test" connectionPassword="test" + userTable="users" userNameCol="user_name" userCredCol="user_pass" + userRoleTable="user_roles" roleNameCol="role_name" /> + --> + + <!-- + <Realm className="org.apache.catalina.realm.JDBCRealm" + driverName="oracle.jdbc.driver.OracleDriver" + connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL" + connectionName="scott" connectionPassword="tiger" + userTable="users" userNameCol="user_name" userCredCol="user_pass" + userRoleTable="user_roles" roleNameCol="role_name" /> + --> + + <!-- + <Realm className="org.apache.catalina.realm.JDBCRealm" + driverName="sun.jdbc.odbc.JdbcOdbcDriver" + connectionURL="jdbc:odbc:CATALINA" + userTable="users" userNameCol="user_name" userCredCol="user_pass" + userRoleTable="user_roles" roleNameCol="role_name" /> + --> + + <!-- Define the default virtual host + Note: XML Schema validation will not work with Xerces 2.2. + --> + <Host name="localhost" appBase="webapps" + unpackWARs="true" autoDeploy="true" + xmlValidation="false" xmlNamespaceAware="false"> + + <!-- Defines a cluster for this node, + By defining this element, means that every manager will be changed. + So when running a cluster, only make sure that you have webapps in there + that need to be clustered and remove the other ones. + A cluster has the following parameters: + + className = the fully qualified name of the cluster class + + clusterName = a descriptive name for your cluster, can be anything + + mcastAddr = the multicast address, has to be the same for all the nodes + + mcastPort = the multicast port, has to be the same for all the nodes + + mcastBindAddress = bind the multicast socket to a specific address + + mcastTTL = the multicast TTL if you want to limit your broadcast + + mcastSoTimeout = the multicast readtimeout + + mcastFrequency = the number of milliseconds in between sending a "I'm alive" heartbeat + + mcastDropTime = the number a milliseconds before a node is considered "dead" if no heartbeat is received + + tcpThreadCount = the number of threads to handle incoming replication requests, optimal would be the same amount of threads as nodes + + tcpListenAddress = the listen address (bind address) for TCP cluster request on this host, + in case of multiple ethernet cards. + auto means that address becomes + InetAddress.getLocalHost().getHostAddress() + + tcpListenPort = the tcp listen port + + tcpSelectorTimeout = the timeout (ms) for the Selector.select() method in case the OS + has a wakup bug in java.nio. Set to 0 for no timeout + + printToScreen = true means that managers will also print to std.out + + expireSessionsOnShutdown = true means that + + useDirtyFlag = true means that we only replicate a session after setAttribute,removeAttribute has been called. + false means to replicate the session after each request. + false means that replication would work for the following piece of code: (only for SimpleTcpReplicationManager) + <% + HashMap map = (HashMap)session.getAttribute("map"); + map.put("key","value"); + %> + replicationMode = can be either 'pooled', 'synchronous' or 'asynchronous'. + * Pooled means that the replication happens using several sockets in a synchronous way. Ie, the data gets replicated, then the request return. This is the same as the 'synchronous' setting except it uses a pool of sockets, hence it is multithreaded. This is the fastest and safest configuration. To use this, also increase the nr of tcp threads that you have dealing with replication. + * Synchronous means that the thread that executes the request, is also the + thread the replicates the data to the other nodes, and will not return until all + nodes have received the information. + * Asynchronous means that there is a specific 'sender' thread for each cluster node, + so the request thread will queue the replication request into a "smart" queue, + and then return to the client. + The "smart" queue is a queue where when a session is added to the queue, and the same session + already exists in the queue from a previous request, that session will be replaced + in the queue instead of replicating two requests. This almost never happens, unless there is a + large network delay. + --> + <!-- + When configuring for clustering, you also add in a valve to catch all the requests + coming in, at the end of the request, the session may or may not be replicated. + A session is replicated if and only if all the conditions are met: + 1. useDirtyFlag is true or setAttribute or removeAttribute has been called AND + 2. a session exists (has been created) + 3. the request is not trapped by the "filter" attribute + + The filter attribute is to filter out requests that could not modify the session, + hence we don't replicate the session after the end of this request. + The filter is negative, ie, anything you put in the filter, you mean to filter out, + ie, no replication will be done on requests that match one of the filters. + The filter attribute is delimited by ;, so you can't escape out ; even if you wanted to. + + filter=".*\.gif;.*\.js;" means that we will not replicate the session after requests with the URI + ending with .gif and .js are intercepted. + + The deployer element can be used to deploy apps cluster wide. + Currently the deployment only deploys/undeploys to working members in the cluster + so no WARs are copied upons startup of a broken node. + The deployer watches a directory (watchDir) for WAR files when watchEnabled="true" + When a new war file is added the war gets deployed to the local instance, + and then deployed to the other instances in the cluster. + When a war file is deleted from the watchDir the war is undeployed locally + and cluster wide + --> + + <!-- + <Cluster className="org.apache.catalina.cluster.tcp.SimpleTcpCluster" + managerClassName="org.apache.catalina.cluster.session.DeltaManager" + expireSessionsOnShutdown="false" + useDirtyFlag="true" + notifyListenersOnReplication="true"> + + <Membership + className="org.apache.catalina.cluster.mcast.McastService" + mcastAddr="228.0.0.4" + mcastPort="45564" + mcastFrequency="500" + mcastDropTime="3000"/> + + <Receiver + className="org.apache.catalina.cluster.tcp.ReplicationListener" + tcpListenAddress="auto" + tcpListenPort="4001" + tcpSelectorTimeout="100" + tcpThreadCount="6"/> + + <Sender + className="org.apache.catalina.cluster.tcp.ReplicationTransmitter" + replicationMode="pooled" + ackTimeout="15000" + waitForAck="true"/> + + <Valve className="org.apache.catalina.cluster.tcp.ReplicationValve" + filter=".*\.gif;.*\.js;.*\.jpg;.*\.png;.*\.htm;.*\.html;.*\.css;.*\.txt;"/> + + <Deployer className="org.apache.catalina.cluster.deploy.FarmWarDeployer" + tempDir="/tmp/war-temp/" + deployDir="/tmp/war-deploy/" + watchDir="/tmp/war-listen/" + watchEnabled="false"/> + + <ClusterListener className="org.apache.catalina.cluster.session.ClusterSessionListener"/> + </Cluster> + --> + + + + <!-- Normally, users must authenticate themselves to each web app + individually. Uncomment the following entry if you would like + a user to be authenticated the first time they encounter a + resource protected by a security constraint, and then have that + user identity maintained across *all* web applications contained + in this virtual host. --> + <!-- + <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> + --> + + <!-- Access log processes all requests for this virtual host. By + default, log files are created in the "logs" directory relative to + $CATALINA_HOME. If you wish, you can specify a different + directory with the "directory" attribute. Specify either a relative + (to $CATALINA_HOME) or absolute path to the desired directory. + --> + <!-- + <Valve className="org.apache.catalina.valves.AccessLogValve" + directory="logs" prefix="localhost_access_log." suffix=".txt" + pattern="common" resolveHosts="false"/> + --> + + <!-- Access log processes all requests for this virtual host. By + default, log files are created in the "logs" directory relative to + $CATALINA_HOME. If you wish, you can specify a different + directory with the "directory" attribute. Specify either a relative + (to $CATALINA_HOME) or absolute path to the desired directory. + This access log implementation is optimized for maximum performance, + but is hardcoded to support only the "common" and "combined" patterns. + --> + <!-- + <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve" + directory="logs" prefix="localhost_access_log." suffix=".txt" + pattern="common" resolveHosts="false"/> + --> + + </Host> + + </Engine> + + </Service> + +</Server>
commit fd8b3c65aa284ca9e270e367edc0012692c18955 Author: Justin Sherrill jsherril@redhat.com Date: Wed Jun 24 10:48:02 2009 -0400
hopeflly fixing unit test
diff --git a/java/code/src/org/cobbler/CobblerObject.java b/java/code/src/org/cobbler/CobblerObject.java index 4c2e693..172fc18 100644 --- a/java/code/src/org/cobbler/CobblerObject.java +++ b/java/code/src/org/cobbler/CobblerObject.java @@ -477,7 +477,8 @@ public abstract class CobblerObject { * @return returns the red hat key as a string */ public Set<String> getRedHatManagementKeySet() { - String[] sets = ((String) dataMap.get(REDHAT_KEY)).split(","); + String keys = StringUtils.defaultString(getRedHatManagementKey()); + String[] sets = (keys).split(","); Set set = new HashSet(); set.addAll(Arrays.asList(sets)); return set;
commit e525be888ea322e4c503bf99db59f2986ffe4765 Author: Tomas Lestach tlestach@redhat.com Date: Wed Jun 24 15:12:54 2009 +0200
490783 - preventing to read a config file, that must not exist
cron job runs monitor-queue as nocpulse user, so it has no rights to create a config file in /etc/nocpulse/
diff --git a/monitoring/SatConfig/cluster/SatCluster.pm b/monitoring/SatConfig/cluster/SatCluster.pm index 5f0ddef..58ab47b 100644 --- a/monitoring/SatConfig/cluster/SatCluster.pm +++ b/monitoring/SatConfig/cluster/SatCluster.pm @@ -48,13 +48,17 @@ sub initialize print FILE "[garbage]\n"; close(FILE); } - $config = Config::IniFiles->new(-file=>$self->get_configFilename); - $self->set_config($config); - $self->set_id($self->configValueOf('id')); - $self->set_nodeId($self->configValueOf('nodeId')); - $self->set_description($self->configValueOf('description')); - $self->set_customerId($self->configValueOf('customerId')); - $self->set_npIP($self->configValueOf('npIP')); + # notice that FILE must not exist + # (nocpulse user has no write access in /etc/nocpulse) + if ( -f $self->get_configFilename) { + $config = Config::IniFiles->new(-file=>$self->get_configFilename); + $self->set_config($config); + $self->set_id($self->configValueOf('id')); + $self->set_nodeId($self->configValueOf('nodeId')); + $self->set_description($self->configValueOf('description')); + $self->set_customerId($self->configValueOf('customerId')); + $self->set_npIP($self->configValueOf('npIP')); + } return $self; }
commit 942db9dede9654ca3c7b79d1761125514a51b398 Author: Milan Zazrivec mzazrivec@redhat.com Date: Wed Jun 24 14:23:55 2009 +0200
no in-place editing of /etc/oratab under oracle user
Ordinarily, oracle user does not have permissions to rename objects under /etc directory, hence no in-place editing of /etc/oratab under oracle user is possible. This needs to be replaced by a two-step procedure.
diff --git a/spacewalk/setup/share/oracle/upgrade-db-10g.sh b/spacewalk/setup/share/oracle/upgrade-db-10g.sh index e65eecc..1bbee9d 100644 --- a/spacewalk/setup/share/oracle/upgrade-db-10g.sh +++ b/spacewalk/setup/share/oracle/upgrade-db-10g.sh @@ -54,7 +54,8 @@ export ORACLE_SID=$DB_NAME # If the record for satellite database exists, substitute it with new value. # Otherwise create a new record. if grep -q "^$ORACLE_SID:.*$" /etc/oratab; then - sed -i "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/oratab + oratab=$(sed "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/oratab) + echo "$oratab" > /etc/oratab else echo "$ORACLE_SID:$ORACLE_HOME:Y" >> /etc/oratab fi diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/share/oracle/upgrade-db.sh index be9667b..bd0f291 100644 --- a/spacewalk/setup/share/oracle/upgrade-db.sh +++ b/spacewalk/setup/share/oracle/upgrade-db.sh @@ -59,7 +59,8 @@ export ORACLE_SID=$DB_NAME # If the record for satellite database exists, substitute it with new value. # Otherwise create a new record. if grep -q "^$ORACLE_SID:.*$" /etc/oratab; then - sed -i "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/oratab + oratab=$(sed "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/oratab) + echo "$oratab" > /etc/oratab else echo "$ORACLE_SID:$ORACLE_HOME:Y" >> /etc/oratab fi
commit 3dbad2fbda7e5c3358f9d41105c13147f91816a4 Author: Milan Zazrivec mzazrivec@redhat.com Date: Wed Jun 24 14:15:35 2009 +0200
remove extraneous backslash characters
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index 2bbd642..b2bb45d 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -728,9 +728,9 @@ EOQ -err_message => "Could not upgrade database.\n", -err_code => 15, -system_opts => ['/sbin/runuser', 'oracle', '-c', - SHARED_DIR . '/oracle/' . $upgrade_script . \ - " --db " . $answers->{'db-sid'} . \ - " --user " . $answers->{'db-user'}]); + SHARED_DIR . '/oracle/' . $upgrade_script . + " --db $answers->{'db-sid'}" . + " --user $answers->{'db-user'}"]);
system_or_exit(['service', 'oracle', 'restart'], 41, 'Could not restart oracle service');
commit 3f4ffbd9b63cae255b4761eea954064ffeb5c680 Author: Partha Aji paji@redhat.com Date: Tue Jun 23 17:20:33 2009 -0400
Fixed a unit test
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDetailsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDetailsActionTest.java index ba70bc5..628a7ad 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDetailsActionTest.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/test/ProbeDetailsActionTest.java @@ -29,6 +29,7 @@ import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.action.systems.monitoring.ProbeDetailsAction; import com.redhat.rhn.frontend.context.Context; import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; import com.redhat.rhn.manager.monitoring.test.MonitoringManagerTest; import com.redhat.rhn.testing.ActionHelper; import com.redhat.rhn.testing.RhnBaseTestCase; @@ -143,8 +144,8 @@ public class ProbeDetailsActionTest extends RhnBaseTestCase { assertNotNull(ah.getForm().get(ProbeDetailsAction.METRICS));
// Graph and Event log - assertNotNull(ah.getRequest().getAttribute("pageList")); - DataResult dr = (DataResult) ah.getRequest().getAttribute("pageList"); + assertNotNull(ah.getRequest().getAttribute(ListHelper.LIST)); + DataResult dr = (DataResult) ah.getRequest().getAttribute(ListHelper.LIST); assertTrue(dr.size() > 0); assertTrue(dr.getTotalSize() > 0); assertEquals(1, dr.getStart());
commit 20b2878e81f71f0774490703fdfc178960ef5dec Author: Pradeep Kilambi pkilambi@redhat.com Date: Tue Jun 23 15:07:59 2009 -0400
505680 - channel_product_id is computed based on the name, product and version so it will not match the cache as cache is always None. Also dont update the channel_product_id uless the id is different from whats being updated
diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py index 1d39047..1c0ba13 100644 --- a/backend/server/importlib/backend.py +++ b/backend/server/importlib/backend.py @@ -1132,6 +1132,7 @@ class Backend: UPDATE rhnChannel SET channel_product_id = :channel_product_id WHERE id = :id + AND channel_product_id <> :channel_product_id """)
statement.execute(id = channel.id, @@ -2009,7 +2010,7 @@ def _buildExternalValue(dict, entry, tableObj): def computeDiff(hash1, hash2, diffHash, diffobj, prefix=None): # Compare if the key-values of hash1 are a subset of hash2's difference = 0 - ignore_keys = ['last_modified'] + ignore_keys = ['last_modified', 'channel_product_id']
for k, v in hash1.items(): if k in ignore_keys:
commit b9384a103a7e51afe3a2e524172280b3f37dae3f Author: Partha Aji paji@redhat.com Date: Tue Jun 23 14:07:22 2009 -0400
506702 - Converted probe details page to use the new list to get the correct csv
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDetailsAction.java index 03a0dcd..43419c5 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDetailsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/monitoring/ProbeDetailsAction.java @@ -26,6 +26,8 @@ import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.frontend.action.common.DateRangePicker; import com.redhat.rhn.frontend.action.common.DateRangePicker.DatePickerResults; import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.monitoring.MonitoringManager;
import org.apache.commons.lang.BooleanUtils; @@ -41,6 +43,7 @@ import java.sql.Timestamp; import java.util.Calendar; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map;
import javax.servlet.http.HttpServletRequest; @@ -53,7 +56,7 @@ import javax.servlet.http.HttpServletResponse; * * @version $Rev$ */ -public class ProbeDetailsAction extends BaseProbeAction { +public class ProbeDetailsAction extends BaseProbeAction implements Listable {
public static final String IS_SUITE_PROBE = "is_suite_probe"; public static final String SHOW_LOG = "show_log"; @@ -164,7 +167,9 @@ public class ProbeDetailsAction extends BaseProbeAction { MonitoringManager.getInstance().getProbeStateChangeData(probe, new Timestamp(dates.getStart().getCalendar().getTimeInMillis()), new Timestamp(dates.getEnd().getCalendar().getTimeInMillis())); - req.setAttribute("pageList", dr); + req.setAttribute(ListHelper.LIST, dr); + ListHelper helper = new ListHelper(this, req); + helper.execute(); } }
@@ -203,4 +208,12 @@ public class ProbeDetailsAction extends BaseProbeAction { return mapping.findForward("default"); }
+ /** + * part of the Listable interface + * {@inheritDoc} + */ + public List getResult(RequestContext context) { + return (List)context.getRequest().getAttribute(ListHelper.LIST); + } + } 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 9e5b5a5..dcae87c 100644 --- a/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/probes/details.jsp @@ -3,7 +3,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> - +<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %> html:xhtml/ <html> <head> @@ -107,19 +107,27 @@ </c:if> <c:if test="${requestScope.show_log}"> <h2><bean:message key="probedetails.jsp.eventlog"/></h2> - <rhn:list pageList="${requestScope.pageList}" noDataText="probedetails.jsp.noevents"> - <rhn:listdisplay exportColumns="entryDate,state,message"> - <rhn:column header="probedetails.jsp.timestamp"> - ${current.entryDate} - </rhn:column> - <rhn:column header="probedetails.jsp.state"> - ${current.state} - </rhn:column> - <rhn:column header="probedetails.jsp.message"> - ${current.htmlifiedMessage} - </rhn:column> - </rhn:listdisplay> - </rhn:list> +<rl:listset name="probeSet"> +<!-- Start of active probes list --> +<rl:list width="100%" + emptykey="probedetails.jsp.noevents"> + <!-- Timestamp column --> + <rl:column bound="true" + attr="entryDate" + headerkey="probedetails.jsp.timestamp" + styleclass="first-column"/> + <!-- state column --> + <rl:column bound="true" + attr="state" + headerkey="probedetails.jsp.state"/> + <!-- message column --> + <rl:column bound="true" + attr="htmlifiedMessage" + headerkey="probedetails.jsp.message" + styleclass="last-column"/> +</rl:list> +rl:csv exportColumns="entryDate,state,message"/ +</rl:listset> </c:if> <c:if test="${requestScope.show_graph ne true && requestScope.show_log ne true}"> <bean:message key="probedetails.jsp.noselection"/>
spacewalk-commits@lists.fedorahosted.org