Branch: refs/heads/feature/bz1069606-rebase-eap-63 Home: https://github.com/rhq-project/rhq Commit: 195b18b45f43f712cedc00d51bfc2ffccc83a38e https://github.com/rhq-project/rhq/commit/195b18b45f43f712cedc00d51bfc2ffccc... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-30 (Wed, 30 Apr 2014)

Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/configuration/ConfigurationServerService.java M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java

Log Message: ----------- [1070326] Do not individually track applications with the same WEB Context This is an initial commit for consideration. It enhances discovery in the as7 plugin such that Deployments automatically process versioned artifact names. For example, myapp-1.0.war results in a Deployment resource of myapp.way with version 1.0. A subsequent deployment of myapp-2.0.war results in the existing myapp.war resource being upped to version 2.0.

This is applied to any Deployment based on the SubsystemDiscovery class.

Moreover, general support has been added such that when discovering a new version of an existing resource, not only is the version updated, but the resource's plugin configuration is updated with any properties set by the discovery. In this way if the new version requires updated connection props (like the EAP address path used to connect) it gets updated. Since only those props set by discovery are updated, any existing customizations will be maintained in the existing configuration.

Commit: 603e488dafab8ef2b94cd7d003149ee4488d1d53 https://github.com/rhq-project/rhq/commit/603e488dafab8ef2b94cd7d003149ee448... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-05-16 (Fri, 16 May 2014)

Changed paths: M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedSubsystemDiscovery.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeDiscoveryComponent.java M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JBossASPluginTest.java

Log Message: ----------- [1070326] RFE: Allow AS7 deployments to provide version in the artifact name - Limit the special version-handling to only Deployments or those types that "run-inside" Deployments. - Make the version Pattern configurable. - Make the regex matching more efficient by using a single Matcher and resetting as necessary. - fix up a mock

Commit: 9bc96ca434b4dbef440a73f8f6f36bc6dc1bc240 https://github.com/rhq-project/rhq/commit/9bc96ca434b4dbef440a73f8f6f36bc6dc... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-05-16 (Fri, 16 May 2014)

Changed paths: M modules/plugins/sudoers/src/main/resources/META-INF/rhq-plugin.xml

Log Message: ----------- [545544] Trivial description fix

Commit: 948b646e37826f0062af1f24b77738e847d7a546 https://github.com/rhq-project/rhq/commit/948b646e37826f0062af1f24b77738e847... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-06-02 (Mon, 02 Jun 2014)

Changed paths: M .gitignore M code-coverage/pom.xml M etc/eclipse-tools/hibernate.cfg.xml M etc/samples/mbeans-on-as7-plugin/pom.xml M etc/samples/skeleton-plugin/src/main/resources/META-INF/rhq-plugin.xml A modules/.gitignore M modules/cli-tests/pom.xml M modules/common/ant-bundle/pom.xml M modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java M modules/common/cassandra-auth/pom.xml M modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml M modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml M modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml M modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml M modules/common/cassandra-ccm/pom.xml M modules/common/cassandra-installer/pom.xml M modules/common/cassandra-schema/pom.xml M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/AbstractManager.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/CQLStep.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/DBConnectionFactory.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/PopulateCacheIndex.java M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaUpdateThreadFactory.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/Step.java M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/UpdateFile.java M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/VersionManager.java A modules/common/cassandra-schema/src/main/resources/schema/update/0003.xml M modules/common/cassandra-schema/src/test/java/org/rhq/cassandra/schema/UpdateFileTest.java M modules/common/cassandra-util/pom.xml M modules/common/drift/pom.xml M modules/common/filetemplate-bundle/pom.xml M modules/common/jboss-as-dmr-client/pom.xml M modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java M modules/common/jboss-as/pom.xml M modules/common/pom.xml M modules/core/arquillian-integration/archive/pom.xml M modules/core/arquillian-integration/container/pom.xml M modules/core/arquillian-integration/pom.xml M modules/core/arquillian-integration/suite-extension/pom.xml M modules/core/arquillian-integration/test-agent-plugin/pom.xml M modules/core/client-api/pom.xml A modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/lifecycle/PluginContainerLifecycle.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/SubCategoriesMetadataParser.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/PingRequest.java M modules/core/client-api/src/main/resources/rhq-plugin.xsd M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/SubCategoriesMetadataParserTest.java M modules/core/comm-api/pom.xml M modules/core/dbutils/pom.xml A modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SubcategoryUpgradeTask.java M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/dbutils/src/main/scripts/dbsetup/obsolete-schema.xml M modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/intentional-api-changes-since-4.10.0.xml A modules/core/domain/intentional-api-changes-since-4.11.0.xml M modules/core/domain/pom.xml M modules/core/domain/src/main/java/org/rhq/core/domain/common/ProductInfo.java M modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java A modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PluginCriteria.java M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.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/install/remote/SSHSecurityException.java M modules/core/domain/src/main/java/org/rhq/core/domain/measurement/AvailabilityType.java M modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementSchedule.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Agent.java A modules/core/domain/src/main/java/org/rhq/core/domain/resource/MissingPolicy.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ProblemResourceComposite.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceAvailabilitySummary.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/AutoGroupCompositeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceSubCategoryFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceTypeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/AutoGroupComposite.java M modules/core/gui/pom.xml M modules/core/native-system/pom.xml M modules/core/plugin-api/pom.xml M modules/core/plugin-container-itest/pom.xml M modules/core/plugin-container/pom.xml M modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/DeleteContentRunner.java M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityProxy.java M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java M modules/core/plugin-test-api/pom.xml M modules/core/plugin-test-util/pom.xml M modules/core/plugin-validator/pom.xml M modules/core/plugindoc/pom.xml M modules/core/plugindoc/src/main/java/org/rhq/core/tool/plugindoc/PluginDescriptorProcessor.java M modules/core/pom.xml M modules/core/util/pom.xml 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/updater/Deployer.java M modules/core/util/src/main/java/org/rhq/core/util/updater/DeploymentData.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/updater/DeployerTest.java M modules/enterprise/agent/pom.xml M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java A modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/PluginContainerLifecycleListener.java M modules/enterprise/agentupdate/pom.xml M modules/enterprise/binding/pom.xml M modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java M modules/enterprise/comm/pom.xml M modules/enterprise/gui/agentupdate-war/pom.xml M modules/enterprise/gui/content_http-war/pom.xml M modules/enterprise/gui/coregui/pom.xml M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/CoreGUI.java R modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/Footer.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/AgentPluginTableView.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/templates/IgnoreResourceTypesView.java A modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/MissingPolicyResourceTypesView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/templates/ResourceTypeTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/topology/AgentDetailView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/table/Table.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/DashboardView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/footer/FavoritesButton.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/MeasurementChartsGWTService.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/gwt/ResourceTypeGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/InventoryView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.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/groups/detail/ResourceGroupContextMenu.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/groups/detail/monitoring/metric/MetricsGroupViewDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3MultiLineGraph.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersComparisonView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMetricsTableDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/summary/ActivityView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ChildHistoryView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/summary/ActivityView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypeRepository.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/operation/OperationHistoryView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/report/measurement/MeasurementOOBDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/util/message/MessageBar.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/util/message/MessageCenterView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/MeasurementChartsGWTServiceImpl.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/java/org/rhq/coregui/server/gwt/ResourceTypeGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/CoreGUI.gwt.xml 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 R modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.11.0.css A modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.12.0.css M modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html R modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.11.0.css A modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.12.0.css A modules/enterprise/gui/coregui/src/main/webapp/css/patternfly-custom.css M modules/enterprise/gui/coregui/src/main/webapp/css/patternfly.css A modules/enterprise/gui/coregui/src/main/webapp/fonts/FontAwesome.otf A modules/enterprise/gui/coregui/src/main/webapp/fonts/fontawesome-webfont.eot A modules/enterprise/gui/coregui/src/main/webapp/fonts/fontawesome-webfont.svg A modules/enterprise/gui/coregui/src/main/webapp/fonts/fontawesome-webfont.ttf A modules/enterprise/gui/coregui/src/main/webapp/fonts/fontawesome-webfont.woff A modules/enterprise/gui/coregui/src/main/webapp/img/top-bar.png R modules/enterprise/gui/coregui/src/main/webapp/js/d3.v3.3.13.js R modules/enterprise/gui/coregui/src/main/webapp/js/d3.v3.3.13.min.js A modules/enterprise/gui/coregui/src/main/webapp/js/d3.v3.3.48.js A modules/enterprise/gui/coregui/src/main/webapp/js/d3.v3.3.48.min.js A modules/enterprise/gui/coregui/src/main/webapp/js/jquery-login-page-only-1.11.1.min.js A modules/enterprise/gui/coregui/src/main/webapp/js/respond.min.js R modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.11.0.js A modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.12.0.js M modules/enterprise/gui/coregui/src/main/webapp/login M modules/enterprise/gui/downloads-war/pom.xml M modules/enterprise/gui/pom.xml M modules/enterprise/gui/portal-war/pom.xml M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ResourceMetricsFormPrepareAction.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/tables/MetricsTableUIBean.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeNode.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java M modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/fileUpload.xhtml M modules/enterprise/gui/remote-client-war/pom.xml M modules/enterprise/gui/remoting-war/pom.xml M modules/enterprise/gui/rest-examples-war/pom.xml M modules/enterprise/gui/rest-war/pom.xml M modules/enterprise/pom.xml M modules/enterprise/remoting/cli/pom.xml M modules/enterprise/remoting/cli/src/main/samples/deploy-to-and-restart-JBAS.js M modules/enterprise/remoting/cli/src/main/samples/modules/jbossas.js M modules/enterprise/remoting/client-api/pom.xml M modules/enterprise/remoting/client-deps/pom.xml M modules/enterprise/remoting/pom.xml M modules/enterprise/scripting/api/pom.xml M modules/enterprise/scripting/javascript/pom.xml M modules/enterprise/scripting/pom.xml M modules/enterprise/scripting/python/pom.xml M modules/enterprise/server/appserver/pom.xml M modules/enterprise/server/appserver/src/main/resources/plugins/README.txt M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml M modules/enterprise/server/client-api/pom.xml M modules/enterprise/server/data-migration/pom.xml M modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/workers/MetricsIndexUpdateAccumulator.java M modules/enterprise/server/ear/pom.xml M modules/enterprise/server/embeddedagent/pom.xml M modules/enterprise/server/installer/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/ServerInstallUtil.java M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java M modules/enterprise/server/installer/src/main/resources/module/main/module.xml M modules/enterprise/server/installer/src/test/java/org/rhq/enterprise/server/installer/client/DatasourceJBossASClientTest.java M modules/enterprise/server/itests-2/pom.xml M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/auth/test/SubjectManagerBeanTest.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/PluginExtensionMetadataTest.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/ResourceMetadataManagerBeanTest.java R modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/SubcategoryTest.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/resource/metadata/test/UpdateResourceSubsystemTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java M modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml M modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml M modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml A modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v3_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml M modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml A modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/old-subcat.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml M modules/enterprise/server/jar/intentional-api-changes-since-4.10.0.xml M modules/enterprise/server/jar/pom.xml M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/agentclient/AgentClient.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/agentclient/impl/AgentClientImpl.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.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/core/AgentManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.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/SSHInstallUtility.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementProblemManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationJob.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.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 A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/UpdatePluginsOnAgentsJob.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ContentHandlerBean.java A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/PluginHandlerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RootHandlerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/StatusHandlerBean.java A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/BooleanValue.java A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/PluginRest.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/AlertAvailabilityDurationJob.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManager.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/importers/SystemSettingsImporter.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java M modules/enterprise/server/jar/src/main/resources/quartz.properties A modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/AgentSupportedVersionTest.java M modules/enterprise/server/plugins/alert-aerogear-ups/pom.xml M modules/enterprise/server/plugins/alert-cli/pom.xml M modules/enterprise/server/plugins/alert-email/pom.xml M modules/enterprise/server/plugins/alert-irc/pom.xml

Log Message: ----------- Merge branch 'master' into jshaughn/as7-deployment

Conflicts: modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JBossASPluginTest.java

Commit: e3206ffd939c41cce87c2efcf5bb3c0628d3fa99 https://github.com/rhq-project/rhq/commit/e3206ffd939c41cce87c2efcf5bb3c0628... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-06-02 (Mon, 02 Jun 2014)

Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java

Log Message: ----------- [614599] add ability to filter by plugin name to AlertCriteria and MeasurementDefinitionCriteria throwing a bone to an old RFE

Commit: 0a5323efceded0d852b18b53e131a72ff3e0dbf4 https://github.com/rhq-project/rhq/commit/0a5323efceded0d852b18b53e131a72ff3... Author: Elias Ross elias_ross@apple.com Date: 2014-06-03 (Tue, 03 Jun 2014)

Changed paths: M modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.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 A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote.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 A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsRemote.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/resource/metadata/PluginManagerRemote.java

Log Message: ----------- BZ 1068816 - More remote methods for managing agent and server plugins, metrics

Exposing mostly methods already available as part of the Local interface.

Not sure if the List<Integer> methods should be exposed, as it is a hassle to use via JavaScript, but it is possible to use these methods anyway.

Commit: dba793094d01905f84c4c55998200b4155239407 https://github.com/rhq-project/rhq/commit/dba793094d01905f84c4c55998200b4155... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-06-04 (Wed, 04 Jun 2014)

Changed paths: A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedRuntimeDiscovery.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedSubsystemDiscovery.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeDiscoveryComponent.java M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml

Log Message: ----------- [1070326] RFE: Allow AS7 deployments to provide version in the artifact name Replace the previous approach with a different one. The previous impl failed to handle embedded, versioned deployments correctly (like Ear-v1.0 containing War-2.0). It also did not properly handle some of the more complicated DMR addresses. This new approach does not attempt to replace the existing discovery, but rather post-processes what is discovered. This separation of concern should be better and more flexible going forward. - also updated the plugin descriptor to more fully capture the types that can be umbrella'd under a Deployment.

Commit: 28d962fcd10e11ecd6a41228cb4d0f8097746450 https://github.com/rhq-project/rhq/commit/28d962fcd10e11ecd6a41228cb4d0f8097... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-06-06 (Fri, 06 Jun 2014)

Changed paths: M modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeRequest.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeResponse.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceUpgradeReport.java M modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeContext.java M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java M modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedRuntimeDiscovery.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedSubsystemDiscovery.java

Log Message: ----------- [1070326] RFE: Allow AS7 deployments to provide version in the artifact name - Add ResourceUpgradeFacet support. - Enhance resourceUpgrade to allow version update - Enhance resourceUpgrade to allow the plugin code to force upgrade of "generic" properties when it knows the upgrade is critical.

Commit: 63f4730ce1ebb950a488df656933687274add524 https://github.com/rhq-project/rhq/commit/63f4730ce1ebb950a488df656933687274... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-06-09 (Mon, 09 Jun 2014)

Changed paths: A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractVersionedSubsystemDiscovery.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedRuntimeDiscovery.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedSubsystemDiscovery.java

Log Message: ----------- [1070326] RFE: Allow AS7 deployments to provide version in the artifact name - Add ability to disable the new feature and keep versioned artifact names by setting sysprope rhq.as7.VersionedSubsystemDiscovery.pattern=disable - Refactor versioned discovery classes to share some common code.

Commit: 48d4c4c5b693dc59fa23b3b8a7a8da221f8d474e https://github.com/rhq-project/rhq/commit/48d4c4c5b693dc59fa23b3b8a7a8da221f... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-06-09 (Mon, 09 Jun 2014)

Changed paths: M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedRuntimeDiscovery.java M modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/WebRuntimeDiscoveryComponentTest.java M modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java M modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/TestDeployments.java A modules/plugins/jboss-as-7/src/test/resources/itest/test-simple-1.0.war

Log Message: ----------- [1070326] RFE: Allow AS7 deployments to provide version in the artifact name Some test work: - update DeploymentTest to deal with a versioned artifact - add a little null protection - add a new mock for a new code path

Commit: 329e0cd917f5a559ccf4b51813089b337a63fa85 https://github.com/rhq-project/rhq/commit/329e0cd917f5a559ccf4b51813089b337a... Author: Jirka Kremser jkremser@redhat.com Date: 2014-06-10 (Tue, 10 Jun 2014)

Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java

Log Message: ----------- Fixing my fix (1ad2557a7): missing RHQ logo in menu bar

Commit: de7133e04b3dbaf5d66148ae5938530df8772b2b https://github.com/rhq-project/rhq/commit/de7133e04b3dbaf5d66148ae5938530df8... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-06-10 (Tue, 10 Jun 2014)

Changed paths: M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml

Log Message: ----------- [1070326] RFE: Allow AS7 deployments to provide version in the artifact name Add some <help> to as7 plugin descriptor describing the new feature.

Commit: cf291f4fce893b0e5b3bb8244d787055f8036e0b https://github.com/rhq-project/rhq/commit/cf291f4fce893b0e5b3bb8244d787055f8... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-06-10 (Tue, 10 Jun 2014)

Changed paths: M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/PopulateCacheIndex.java A modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/Table.java M modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/TopologyManager.java M modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SubcategoryUpgradeTask.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java A modules/enterprise/gui/coregui/src/main/webapp/img/logo-login.png A modules/enterprise/gui/coregui/src/main/webapp/img/logo-login.svg R modules/enterprise/gui/coregui/src/main/webapp/img/logo.png R modules/enterprise/gui/coregui/src/main/webapp/img/logo.svg M modules/enterprise/gui/coregui/src/main/webapp/login M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitor.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitorMBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManager.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Buckets.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsConfiguration.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsConstants.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/AggregationManager.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/BaseAggregator.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CacheAggregator.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/CacheIndexQueryException.java A modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/IndexEntriesLoader.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/PastDataAggregator.java M modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/CacheIndexEntry.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/AggregationTests.java A modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/IndexEntriesLoaderTest.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java M modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsTest.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/AdditionalJavaOpts.java M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml

Log Message: ----------- Merge branch 'master' into jshaughn/as7-deployment

Commit: cee97ce525eb91af60c443dea9c3152eae61ff79 https://github.com/rhq-project/rhq/commit/cee97ce525eb91af60c443dea9c3152eae... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-06-10 (Tue, 10 Jun 2014)

Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceTypeHandlerBean.java

Log Message: ----------- Apply paging in /resource/type REST endpoint.

Commit: 74242f9c9d21819c2e2248be929f9344779e1a59 https://github.com/rhq-project/rhq/commit/74242f9c9d21819c2e2248be929f934477... Author: Jirka Kremser jkremser@redhat.com Date: 2014-06-10 (Tue, 10 Jun 2014)

Changed paths: R modules/enterprise/gui/coregui/src/main/webapp/img/logo-login.png R modules/enterprise/gui/coregui/src/main/webapp/img/logo-login.svg A modules/enterprise/gui/coregui/src/main/webapp/img/logo.png A modules/enterprise/gui/coregui/src/main/webapp/img/logo.svg M modules/enterprise/gui/coregui/src/main/webapp/login

Log Message: ----------- missing RHQ Logo: 2nd portion of fix

Commit: 5d42dccbfdf1ff301b778b5e70c7fb52aeb5ed0a https://github.com/rhq-project/rhq/commit/5d42dccbfdf1ff301b778b5e70c7fb52ae... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-06-10 (Tue, 10 Jun 2014)

Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceUpgradeReport.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java

Log Message: ----------- [1070326] RFE: Allow AS7 deployments to provide version in the artifact name After feedback, remove 'version' as a "generic" property, affected by the setting of SystemSetting.ALLOW_RESOURCE_GENERIC_PROPERTIES_UPGRADE.

Commit: d1cf00128ae79434020c543e9a563b244aa5b234 https://github.com/rhq-project/rhq/commit/d1cf00128ae79434020c543e9a563b244a... Author: Lukas Krejci metlos@users.noreply.github.com Date: 2014-06-11 (Wed, 11 Jun 2014)

Changed paths: M modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.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 A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote.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 A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsRemote.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/resource/metadata/PluginManagerRemote.java

Log Message: ----------- Merge pull request #44 from genman/genman/moreremote

BZ 1068816 - More remote methods for managing agent and server plugins, metrics

Commit: 343fec70bafc57f36e61f25ed1fc3e965ca88dd5 https://github.com/rhq-project/rhq/commit/343fec70bafc57f36e61f25ed1fc3e965c... Author: Thomas Segismont tsegismo@redhat.com Date: 2014-06-11 (Wed, 11 Jun 2014)

Changed paths: M etc/samples/mbeans-on-as7-plugin/pom.xml

Log Message: ----------- Update custom plugin sample following latest changes in rhq-agent-plugin-plugin

See Upload mojo: RHQ4.12 allows to wait for plugin scan and plugins update on all agents https://github.com/rhq-project/rhq-agent-plugin-plugin/issues/16

Commit: 2404fdf0864a779cd7e5af63ae52841687596d8a https://github.com/rhq-project/rhq/commit/2404fdf0864a779cd7e5af63ae52841687... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-06-12 (Thu, 12 Jun 2014)

Changed paths: A modules/enterprise/server/jar/intentional-api-changes-since-4.11.0.xml

Log Message: ----------- [BZ 1068816] - Forgot to add an API change record for the newly exposed method.

Commit: 3150c41379c2530a4ab50fd216fa891c0d78553d https://github.com/rhq-project/rhq/commit/3150c41379c2530a4ab50fd216fa891c0d... Author: Lukas Krejci lkrejci@redhat.com Date: 2014-06-12 (Thu, 12 Jun 2014)

Changed paths: M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoSubscriptions-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/installed_package_details-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription_packages-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/update-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/include/pagination.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/monitor/schedules-plain.xhtml

Log Message: ----------- [BZ 1078510] - Make sure to use the "plain" pagination on "plain" jsf pages

This avoids the warning arising from the "non-plain" pagination trying to access page elements not present on the plain pages.

Commit: 0c2765f2760d5c96d5cdef84689c82fb2aa1a694 https://github.com/rhq-project/rhq/commit/0c2765f2760d5c96d5cdef84689c82fb2a... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-06-12 (Thu, 12 Jun 2014)

Changed paths: M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml

Log Message: ----------- Add some more <Help> text to the AS7 plugin for the new Versioned Deployment and Missing resource policy features.

Commit: fd63a383833fac6ce2be2cf99ee0ce56f8d0ebd2 https://github.com/rhq-project/rhq/commit/fd63a383833fac6ce2be2cf99ee0ce56f8... Author: Jean-Frederic Clere jfclere@redhat.com Date: 2014-06-12 (Thu, 12 Jun 2014)

Changed paths: M modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/TomcatConfig.java

Log Message: ----------- [BZ 1104581] Tomcat configured to use SSL is discovered as Tomcat(null) in JBoss ON.

Commit: a3480101861ae6aed8f20d9010507602796504cc https://github.com/rhq-project/rhq/commit/a3480101861ae6aed8f20d901050760279... Author: Thomas Segismont tsegismo@redhat.com Date: 2014-06-12 (Thu, 12 Jun 2014)

Changed paths: M modules/plugins/jboss-as-7/intentional-api-changes-since-4.11.0.xml A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HibernatePersistenceUnitComponent.java R modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/QueryCacheDiscovery.java M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentRuntimeResourcesTest.java

Log Message: ----------- Bug 1033130 - [AS7] Exception during discovery of Query Cache resources of RHQ Server resource

Instead of importing tons of Query Cache resources, AS7 plugin will mimic Hibernate Plugin's behavior and expose a "viewQueries" operation to gather the Query Cache nodes statistics.

Added HibernatePersistenceUnitComponent to implement "viewQueries" operation. The operation processes Query Cache nodes in batches to avoid sending too many queries to the management interface Deleted the never used QueryCacheDiscovery class (updated API check file accordingly) Removed the commented-out Query Cache service in AS7 plugin descriptor and added the "viewQueries" operation on the Hibernate Persistence Unit service Added itest for the "viewQueries" operation

Commit: 8cca19810d4a684fd9f376328bc5e45054684845 https://github.com/rhq-project/rhq/commit/8cca19810d4a684fd9f376328bc5e45054... Author: Thomas Segismont tsegismont@gmail.com Date: 2014-06-13 (Fri, 13 Jun 2014)

Changed paths: M modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/TomcatConfig.java

Log Message: ----------- Merge pull request #53 from jfclere/master

[BZ 1104581] Tomcat configured to use SSL is discovered as Tomcat(null) ...

Commit: 2fa7c545cb0225916ae27965a143de2a6f85748f https://github.com/rhq-project/rhq/commit/2fa7c545cb0225916ae27965a143de2a6f... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-06-13 (Fri, 13 Jun 2014)

Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/discovery/DiscoveryAgentService.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java

Log Message: ----------- [1094540] Agents get permanently backfilled if backend database goes offline for a moment Clean up some of the live availability doco/workflow: - Fix the jdoc for DiscoveryAgentService.getCurrentAvailability() to reflect reality - Fix ResourceManagerBean.getLiveResourceAvailability() to mark its avail report as a "ServerSideReport". This prevents it from interfering with server-agent backfill coordination. Also, correct some confusing inline doco and doe some cleanup. - Fix AvailabilityManagerBean.mergeAvailabilityReport() such that logic checking for the backfill flag does not execute *after* the backfill flag has been reset. And clean up the overall logic a bit more. - Improve jdoc for AvailabilityManagerLocal.updateLastAvailabilityReportInNewTransaction to clearly indicate its side-effect of clearing the backfill flag.

Commit: 4d3d64c9159083c282bd7bec7db3c336de2626d0 https://github.com/rhq-project/rhq/commit/4d3d64c9159083c282bd7bec7db3c336de... Author: John Mazzitelli mazz@redhat.com Date: 2014-06-13 (Fri, 13 Jun 2014)

Changed paths: M etc/samples/mbeans-on-as7-plugin/pom.xml M modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/discovery/DiscoveryAgentService.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeRequest.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeResponse.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/configuration/ConfigurationServerService.java M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceUpgradeReport.java M modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeContext.java M modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java M modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java M modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java R modules/enterprise/gui/coregui/src/main/webapp/img/logo-login.png R modules/enterprise/gui/coregui/src/main/webapp/img/logo-login.svg A modules/enterprise/gui/coregui/src/main/webapp/img/logo.png A modules/enterprise/gui/coregui/src/main/webapp/img/logo.svg M modules/enterprise/gui/coregui/src/main/webapp/login M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoSubscriptions-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/installed_package_details-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription_packages-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/update-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/include/pagination.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/monitor/schedules-plain.xhtml A modules/enterprise/server/jar/intentional-api-changes-since-4.11.0.xml M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.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 A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerRemote.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/measurement/AvailabilityManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote.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 A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.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/resource/metadata/PluginManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceTypeHandlerBean.java M modules/plugins/jboss-as-7/intentional-api-changes-since-4.11.0.xml A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractVersionedSubsystemDiscovery.java A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HibernatePersistenceUnitComponent.java R modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/QueryCacheDiscovery.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedRuntimeDiscovery.java A modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VersionedSubsystemDiscovery.java M modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeDiscoveryComponent.java M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/WebRuntimeDiscoveryComponentTest.java M modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentRuntimeResourcesTest.java M modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java M modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/TestDeployments.java A modules/plugins/jboss-as-7/src/test/resources/itest/test-simple-1.0.war M modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JBossASPluginTest.java M modules/plugins/sudoers/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/TomcatConfig.java

Log Message: ----------- Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63

Compare: https://github.com/rhq-project/rhq/compare/dadc434100ce...4d3d64c91590