Branch: refs/heads/master Home: https://github.com/rhq-project/rhq Commit: 742bf8d9f53baaafa8fbeb70263174b50041d63a https://github.com/rhq-project/rhq/commit/742bf8d9f53baaafa8fbeb70263174b500... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-03-25 (Tue, 25 Mar 2014)
Changed paths: M modules/core/dbutils/pom.xml M modules/core/dbutils/src/main/scripts/dbsetup/amps-schema.xml M modules/core/dbutils/src/main/scripts/dbsetup/dbsetup-schema.xsd M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/AbstractPlugin.java M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/Plugin.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/AgentPluginTableView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/PluginGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/PluginGWTServiceImpl.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/InstalledPluginsUIBean.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/AgentPluginScanner.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/PurgePluginsJob.java
Log Message: ----------- [BZ 1076104] Agent plugins don't require explicit purge to disappear from DB.
Commit: 38941df0fa21bce48a44572698d5f2485da0ec8b https://github.com/rhq-project/rhq/commit/38941df0fa21bce48a44572698d5f2485d... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-03-27 (Thu, 27 Mar 2014)
Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPlugin.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/ServerPluginTableView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/PluginGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/PluginGWTServiceImpl.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/InstalledPluginsUIBean.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/ServerPluginsBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/GenericServerPluginTest.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ServerPluginScanner.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/PurgePluginsJob.java
Log Message: ----------- [BZ 1076104] Server plugins don't require explicit purge do disappear.
Commit: 2aa4cce04b0c2fa01fe6975874b597e3a9817128 https://github.com/rhq-project/rhq/commit/2aa4cce04b0c2fa01fe6975874b597e3a9... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-03-27 (Thu, 27 Mar 2014)
Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/Plugin.java
Log Message: ----------- Fixing API breakage
Commit: 104f62cc5a93c4c2e36e9f676eb80768e22ff8fc https://github.com/rhq-project/rhq/commit/104f62cc5a93c4c2e36e9f676eb80768e2... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths: M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
Log Message: ----------- Cleanup of itests to not influence each other when setting server identity and manipulating plugins.
Also fixed the PluginManagerBeanTest#isPluginReadyForPurge() by realizing that other tests (that now correctly clean up after themselves) may have already deleted the plugins that were marked to be deleted in the test method the isPluginReadyForPurge depends on.
Commit: a5e6b36964b0c113ef4042edbecb459d909252f8 https://github.com/rhq-project/rhq/commit/a5e6b36964b0c113ef4042edbecb459d90... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java
Log Message: ----------- Removed unused method from local SLSB and some small docs updates.
Commit: 8eaa8885e0b01eac9d1ecfcbcdbfc543ac81f2a0 https://github.com/rhq-project/rhq/commit/8eaa8885e0b01eac9d1ecfcbcdbfc543ac... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M .classpath M .settings/org.eclipse.core.resources.prefs A etc/greasemonkey/RHQ_login_monkey-before-4.11.user.js M etc/greasemonkey/RHQ_login_monkey.user.js M etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/inventory/CreateResourceRequest.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/AgentPluginDescriptorUtil.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/DescriptorPackages.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationRequest.java A modules/core/client-api/src/main/resources/rhq-canned-groups.xsd M modules/core/dbutils/pom.xml M modules/core/dbutils/src/main/java/org/rhq/core/db/Oracle12DatabaseType.java M modules/core/dbutils/src/main/scripts/dbsetup/cluster-schema.xml M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/pom.xml M modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java M modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ConfigurationUtility.java M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupDefinitionCriteria.java A modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstall.java M modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallInfo.java A modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/CustomAgentInstallData.java M modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/RemoteAccessInfo.java A modules/core/domain/src/main/java/org/rhq/core/domain/plugin/CannedGroupAddition.java A modules/core/domain/src/main/java/org/rhq/core/domain/plugin/CannedGroupExpression.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/GroupDefinition.java M modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java M modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityProxy.java M modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java M modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java M modules/core/util/src/test/java/org/rhq/core/util/file/FileUtilTest.java M modules/core/util/src/test/java/org/rhq/core/util/obfuscation/ObfuscatorTest.java M modules/enterprise/agent/ant-run.xml M modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf M modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_32/wrapper.dll M modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_32/wrapper.exe M modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_32/wrapper.jar A modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_64/wrapper.dll A modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_64/wrapper.exe A modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_64/wrapper.jar M modules/enterprise/agent/src/etc/rhq-agent-wrapper.bat M modules/enterprise/agent/src/etc/rhq-agent-wrapper.sh M modules/enterprise/agent/src/etc/rhq-agent.sh M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java M modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml M modules/enterprise/gui/coregui/pom.xml M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/CoreGUI.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LinkManager.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LoginView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/UserSessionManager.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/AdministrationView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/SystemSettingsView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/agent/install/RemoteAgentInstallView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/topology/AgentTableView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/AlertDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/AlertHistoryView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/upload/FileUploadForm.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/PortletFactory.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/PortletSettingsWindow.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java A modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/AbstractRecentEventsPortlet.java A modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/RecentEventsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/AgentGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/PluginGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/RemoteInstallGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/detail/summary/AbstractActivityView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/event/EventCompositeDatasource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/event/EventCompositeHistoryView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/MetricGraphData.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/AgentGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/FileUploadServlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/PluginGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/RemoteInstallGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties M modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html M modules/enterprise/gui/coregui/src/main/webapp/css/patternfly.css M modules/enterprise/gui/coregui/src/main/webapp/css/patternfly.min.css M modules/enterprise/gui/coregui/src/main/webapp/img/bg-login.jpg R modules/enterprise/gui/coregui/src/main/webapp/img/brand-lg.png R modules/enterprise/gui/coregui/src/main/webapp/img/brand.png R modules/enterprise/gui/coregui/src/main/webapp/img/brand.svg A modules/enterprise/gui/coregui/src/main/webapp/img/caps.png A modules/enterprise/gui/coregui/src/main/webapp/img/feedback-error-arrow-down.png A modules/enterprise/gui/coregui/src/main/webapp/img/feedback-error-sign.png M modules/enterprise/gui/coregui/src/main/webapp/img/logo.png M modules/enterprise/gui/coregui/src/main/webapp/img/logo.svg A modules/enterprise/gui/coregui/src/main/webapp/js/bootstrap.min.js A modules/enterprise/gui/coregui/src/main/webapp/js/jquery.capslockstate.js A modules/enterprise/gui/coregui/src/main/webapp/login M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.sh A modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-env.bat A modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-env.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.inc M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.dll M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.exe M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.jar A modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_64/wrapper.dll A modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_64/wrapper.exe A modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_64/wrapper.jar M modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml M modules/enterprise/server/ear/pom.xml M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java M modules/enterprise/server/itests-2/pom.xml M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java A modules/enterprise/server/jar/intentional-api-changes-since-4.10.0.xml M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginAdditionsReader.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHFileSend.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHInstallUtility.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java M modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanUnitTest.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java A modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQPosixParser.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java A modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-group-expressions.xml M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java A modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/jboss-as/src/main/resources/META-INF/rhq-group-expressions.xml M modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java A modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/TestTarget.java A modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/TestTargetMBean.java A modules/plugins/jmx/src/test/resources/custom-test-plugin.xml A modules/plugins/platform/src/main/resources/META-INF/rhq-group-expressions.xml M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresServerComponent.java M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresTableComponent.java M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresTableDiscoveryComponent.java M modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml M pom.xml
Log Message: ----------- Merge remote-tracking branch 'origin/master' into bug/1076104
Commit: a637f1ee6a2d1cd424924d0b4350818ee6591ca8 https://github.com/rhq-project/rhq/commit/a637f1ee6a2d1cd424924d0b4350818ee6... Author: John Mazzitelli mazz@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/core/dbutils/pom.xml M modules/core/dbutils/src/main/scripts/dbsetup/amps-schema.xml M modules/core/dbutils/src/main/scripts/dbsetup/dbsetup-schema.xsd M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/AbstractPlugin.java M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/Plugin.java M modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPlugin.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/AgentPluginTableView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/ServerPluginTableView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/PluginGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/PluginGWTServiceImpl.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/InstalledPluginsUIBean.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/ServerPluginsBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/GenericServerPluginTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/AgentPluginScanner.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ServerPluginScanner.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/PurgePluginsJob.java
Log Message: ----------- Merge branch 'bug/1076104' of https://github.com/metlos/rhq into metlos-bug/1076104
Commit: 6286a106ce898c32a3a5f60ac9d62f82f03b56d1 https://github.com/rhq-project/rhq/commit/6286a106ce898c32a3a5f60ac9d62f82f0... Author: John Mazzitelli mazz@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/PurgePluginsJob.java
Log Message: ----------- BZ 1076104 - remove bad import
Commit: 5283ef79ea58b21d47742863a975771ff8e8a434 https://github.com/rhq-project/rhq/commit/5283ef79ea58b21d47742863a975771ff8... Author: John Mazzitelli mazz@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths: M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
Log Message: ----------- BZ 1076104 consistent indentation in this file is 4 spaces
Compare: https://github.com/rhq-project/rhq/compare/659c7bd0eb95...5283ef79ea58
rhq-commits@lists.fedorahosted.org
-
John Mazzitelli